diff --git a/media-libs/libgphoto2/libgphoto2-2.5.8.recipe b/media-libs/libgphoto2/libgphoto2-2.5.12.recipe
similarity index 78%
rename from media-libs/libgphoto2/libgphoto2-2.5.8.recipe
rename to media-libs/libgphoto2/libgphoto2-2.5.12.recipe
index df23fa843..8a9e6373e 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.8.recipe
+++ b/media-libs/libgphoto2/libgphoto2-2.5.12.recipe
@@ -9,17 +9,17 @@ to client (programs that call libgphoto2)."
 HOMEPAGE="http://www.gphoto.org/"
 COPYRIGHT="The gphoto2 team"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/gphoto/files/libgphoto2-$portVersion.tar.bz2"
-CHECKSUM_SHA256="031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6"
+CHECKSUM_SHA256="b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e"
 
-ARCHITECTURES="?x86 ?x86_64"
+ARCHITECTURES="?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libgphoto2$secondaryArchSuffix = $portVersion
-	lib:libgphoto2$secondaryArchSuffix = $portVersion
-	lib:libgphoto2_port$secondaryArchSuffix = $portVersion
+	lib:libgphoto2$secondaryArchSuffix = 6.0.0. compat >= 6
+	lib:libgphoto2_port$secondaryArchSuffix = 12.0.0 compat >= 12
 	cmd:gphoto2_config$secondaryArchSuffix = $portVersion
 	cmd:gphoto2_port_config$secondaryArchSuffix = $portVersion
 	"
@@ -27,15 +27,18 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
 	lib:libltdl$secondaryArchSuffix
+	lib:libusb_1.0$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libgphoto2${secondaryArchSuffix}_devel = $portVersion
-	devel:libgphoto2$secondaryArchSuffix = $portVersion
+	devel:libgphoto2$secondaryArchSuffix = 6.0.0. compat >= 6
+	devel:libgphoto2_port$secondaryArchSuffix = 12.0.0 compat >= 12
 	"
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
 	libgphoto2$secondaryArchSuffix == $portVersion base
 	"
 
@@ -66,11 +69,13 @@ BUILD()
 INSTALL()
 {
 	make install
-	prepareInstalledDevelLibs \
-		libgphoto2
+
 	find $libDir -name '*.la' -delete
-	rm $developLibDir/*.la
+
+	prepareInstalledDevelLibs \
+		libgphoto2 libgphoto2_port
 	fixPkgconfig
+
 	packageEntries devel \
 		$developDir
 }
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.9.recipe b/media-libs/libgphoto2/libgphoto2-2.5.9.recipe
deleted file mode 100644
index 2fc600d01..000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.9.recipe
+++ /dev/null
@@ -1,76 +0,0 @@
-SUMMARY="A library that implements support for numerous digital cameras"
-DESCRIPTION="libgphoto2 is the core library designed to allow access to \
-digital camera by external programs. It abstracts communication ports and \
-camera protocol, to allow a complete modularity. To support a new \
-communication physical layer (like IEEE1394), just add a new port to \
-libgphoto2_port. To support a new kind a digital camera, just provide \
-a new camlib with the required callbacks. All of this will be transparent \
-to client (programs that call libgphoto2)."
-HOMEPAGE="http://www.gphoto.org/"
-COPYRIGHT="The gphoto2 team"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="http://sourceforge.net/projects/gphoto/files/libgphoto2-$portVersion.tar.bz2"
-CHECKSUM_SHA256="cdb0e8e3a93417eb25892c4b03e64c07e93488ce05072edb62e1b70ff3291f32"
-
-ARCHITECTURES="?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	libgphoto2$secondaryArchSuffix = $portVersion
-	lib:libgphoto2$secondaryArchSuffix = $portVersion
-	lib:libgphoto2_port$secondaryArchSuffix = $portVersion
-	cmd:gphoto2_config$secondaryArchSuffix = $portVersion
-	cmd:gphoto2_port_config$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libltdl$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libgphoto2${secondaryArchSuffix}_devel = $portVersion
-	devel:libgphoto2$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
-	libgphoto2$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libltdl$secondaryArchSuffix
-	devel:libusb_1.0$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:autom4te
-	cmd:gettext$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	prepareInstalledDevelLibs \
-		libgphoto2
-	find $libDir -name '*.la' -delete
-	rm $developLibDir/*.la
-	fixPkgconfig
-	packageEntries devel \
-		$developDir
-}