Fixed bad installation for docs in 2.2.1 (#139812), added docbook-sgml-dtd-4.2 to deps in attempt to fix doc problems (#100660)(#139812), added patch to fix minor error in docgen for 2.1.6 (#134945)

(Portage version: 2.1-r1)

4 files changed, 51 insertions, 30 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index b08459a44799..adfbba29a375 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.69 2006/07/11 10:21:33 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.70 2006/07/18 11:30:43 liquidx Exp $
+
+  18 Jul 2006; Alastair Tse <liquidx@gentoo.org>
+  -files/libgphoto2-2.1.1-norpm.patch, -files/libgphoto2-2.1.2-canon.patch,
+  -files/libgphoto2-2.1.3-canon.patch, -files/libgphoto2-2.1.4-blink2.patch,
+  -files/libgphoto2-2.1.4-canon.patch,
+  -files/libgphoto2-2.1.4-gcc2_fixes.patch,
+  +files/libgphoto2-2.1.6-gtk-doc-digit-attribute.patch,
+  -libgphoto2-2.1.4.ebuild, -libgphoto2-2.1.5.ebuild,
+  -libgphoto2-2.1.6.ebuild, libgphoto2-2.1.6-r1.ebuild,
+  -libgphoto2-2.1.6-r2.ebuild, -libgphoto2-2.2.0.ebuild,
+  libgphoto2-2.2.1-r1.ebuild:
+  Fixed bad installation for docs in 2.2.1 (#139812), added
+  docbook-sgml-dtd-4.2 to deps in attempt to fix doc problems
+  (#100660)(#139812), added patch to fix minor error in docgen for 2.1.6
+  (#134945)
 
   11 Jul 2006; Daniel Drake <dsd@gentoo.org>
   +files/libgphoto2-2.2.1-ngettext.patch, libgphoto2-2.2.1-r1.ebuild:
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.6-gtk-doc-digit-attribute.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.6-gtk-doc-digit-attribute.patch
new file mode 100644
index 000000000000..ae1ad21f4e39
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.1.6-gtk-doc-digit-attribute.patch
@@ -0,0 +1,11 @@
+--- libgphoto2/gphoto2-camera.c	2006/05/30 18:45:48	1.1
++++ libgphoto2/gphoto2-camera.c	2006/05/30 18:45:58
+@@ -543,7 +543,7 @@ gp_camera_ref (Camera *camera)
+  * @camera: a #Camera
+  *
+  * Decrements the reference count of a @camera. If the reference count 
+- * reaches %0, the @camera will be freed automatically.
++ * reaches 0, the @camera will be freed automatically.
+  *
+  * Return value: a gphoto2 error code
+  **/
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild
index 60334e0f25a8..6f31e9da30cd 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild,v 1.10 2006/07/07 11:20:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild,v 1.11 2006/07/18 11:30:43 liquidx Exp $
 
 inherit libtool eutils
 
@@ -21,9 +21,12 @@ RDEPEND="!nousb? (
 		sys-apps/hotplug
 	)
 	exif? ( >=media-libs/libexif-0.5.9 )"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
+	doc? ( dev-util/gtk-doc 
+		=app-text/docbook-sgml-dtd-4.2*
+	)"
 
 # By default, drivers for all supported cards will be compiled.
 # If you want to only compile for specific card(s), set CAMERAS
@@ -53,7 +56,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
-
+	epatch ${FILESDIR}/${P}-gtk-doc-digit-attribute.patch
 	# make default group 'plugdev', not camera
 	sed -e 's:=camera:=plugdev:' -i packaging/linux-hotplug/usbcam.group
 }
diff --git a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild
index 8f90c6726ab8..59b78de8b9b7 100644
--- a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.2 2006/07/11 10:21:33 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.3 2006/07/18 11:30:43 liquidx Exp $
 
-inherit libtool eutils
+inherit libtool eutils autotools
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -24,7 +24,9 @@ RDEPEND="usb? (
 	hal? ( >=sys-apps/hal-0.5 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
+	doc? ( dev-util/gtk-doc 
+		=app-text/docbook-sgml-dtd-4.2*
+	)"
 
 # By default, drivers for all supported cards will be compiled.
 # If you want to only compile for specific card(s), set CAMERAS
@@ -61,6 +63,13 @@ src_unpack() {
 
 	# make default group 'plugdev', not camera
 	sed -e 's:=camera:=plugdev:' -i packaging/linux-hotplug/usbcam.group
+
+	# fix typo for apidoc
+	# originally in : libgphoto2_port/m4/gp-documentation.m4
+	# but we save on running autoconf again by just patching configure
+	sed -i -e 's:apidocdir\}:apidocdir:g' \
+		configure \
+		libgphoto2_port/configure
 }
 
 src_compile() {
@@ -84,36 +93,19 @@ src_compile() {
 
 	econf \
 		--with-drivers=${cameras} \
+		--with-doc-dir=/usr/share/doc/${PF} \
+		--with-html-dir=/usr/share/doc/${PF}/html \
+		--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
 		$(use_enable nls) \
 		$(use_enable doc docs) \
 		${myconf} || die "econf failed"
 
-	# or the documentation fails.
-	emake || die "make failed"
+	emake apidocdir=/usr/share/doc/${PF}/api || die "make failed"
 }
 
 src_install() {
-	if use usb && use kernel_linux; then
-		make DESTDIR=${D} \
-			gphotodocdir=/usr/share/doc/${PF} \
-			HTML_DIR=/usr/share/doc/${PF}/sgml \
-			hotplugdocdir=/usr/share/doc/${PF}/linux-hotplug \
-			install || die "install failed"
-	else
-		make DESTDIR=${D} \
-			gphotodocdir=/usr/share/doc/${PF} \
-			HTML_DIR=/usr/share/doc/${PF}/sgml \
-			install || die "install failed"
-	fi
-
-	# manually move apidocs
-	if use doc; then
-		dodir /usr/share/doc/${PF}/api
-		mv ${D}/usr/share/doc/libgphoto2/html/api/* ${D}/usr/share/doc/${PF}/api/
-		mv ${D}/usr/share/doc/libgphoto2_port/html/api/* ${D}/usr/share/doc/${PF}/api/
-	fi
-	rm -rf ${D}/usr/share/doc/libgphoto2
-	rm -rf ${D}/usr/share/doc/libgphoto2_port
+	make DESTDIR=${D} install \
+		apidocdir=/usr/share/doc/${PF}/api || die "install failed"
 
 	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING CHANGES