cleanups and revision bump

5 files changed, 87 insertions, 12 deletions

diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 9859936198ab..3e297d19234d 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,7 +1,7 @@
-MD5 3a0d0ca2dbba191f8b4a327cc6041065 ChangeLog 1291
+MD5 ed26dcecdf3988906b6d5736a2b329c4 ChangeLog 1560
 MD5 f3bc84b09c705f02e55251e24c3488a9 libgphoto2-2.1.1-r2.ebuild 1398
-MD5 f32325a0480db392dfef682379e60298 libgphoto2-2.1.1-r3.ebuild 1997
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 192ed79a1946fdb0ae7b8f5bdcff8cbb libgphoto2-2.1.1-r3.ebuild 1968
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r2 70
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r3 70
-MD5 6bf2ad5f742647ef6b4fd475c0dee48e files/libgphoto2-2.1.1-norpm.patch 541
+MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r3 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r3
new file mode 100644
index 000000000000..0504917e8f6d
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r3
@@ -0,0 +1 @@
+MD5 ec69ffba3dc3d6a6a604fd63b3e1159e libgphoto2-2.1.1.tar.bz2 1509102
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch
index 09ad53119489..93e10233cfa4 100644
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch
+++ b/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch
@@ -1,19 +1,18 @@
 --- libgphoto2-2.1.1/configure	2002-12-01 21:46:42.000000000 +0000
-+++ libgphoto2-2.1.1/configure	2003-05-11 02:11:38.000000000 +0100
-@@ -13865,14 +13865,10 @@
++++ libgphoto2-2.1.1/configure	2003-08-18 17:32:26.000000000 +0100
+@@ -13865,14 +13865,9 @@
  # packages we're going to build will depend on libusb and libusb-devel
  # RPM packages or not.
  
 -
 -if rpm -q libusb-devel > /dev/null 2>&1; then
--  RPM_LIBUSB_DEVEL_TRUE=
--  RPM_LIBUSB_DEVEL_FALSE='#'
++# remove rpm -q test to avoid breaking sandbox
+   RPM_LIBUSB_DEVEL_TRUE=
+   RPM_LIBUSB_DEVEL_FALSE='#'
 -else
-+# don't let rpm -q run or else it'll break sandbox.
-   RPM_LIBUSB_DEVEL_TRUE='#'
-   RPM_LIBUSB_DEVEL_FALSE=
+-  RPM_LIBUSB_DEVEL_TRUE='#'
+-  RPM_LIBUSB_DEVEL_FALSE=
 -fi
-+
  
  
  	# effective_target has to be determined in advance
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.1-r3.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.1-r3.ebuild
new file mode 100644
index 000000000000..c0288f24de6c
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.1-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.1-r3.ebuild,v 1.1 2003/08/20 16:44:05 liquidx Exp $
+
+inherit libtool
+
+MAKEOPTS="-j1" # or the documentation fails. bah!
+
+DESCRIPTION="free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="nls doc jpeg"
+
+RDEPEND=">=dev-libs/libusb-0.1.6
+	sys-apps/hotplug
+	jpeg? ( >=media-libs/libexif-0.5.9 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+ 	doc? ( dev-util/gtk-doc )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-norpm.patch
+}
+
+src_compile() {
+	elibtoolize
+
+	local myconf
+	
+	myconf="--with-rpmbuild=/bin/false"
+
+	use jpeg \
+		&& myconf="${myconf} --with-exif-prefix=/usr" \
+		|| myconf="${myconf} --without-exif"
+	
+	myconf="${myconf} `use_enable nls`"
+	myconf="${myconf} `use_enable doc docs`"
+		
+	econf ${myconf}
+	emake || die "make failed"
+}
+
+src_install() {
+	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"
+
+	# manually move apidocs
+	if [ -n "`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
+
+	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING CHANGES
+	
+	# install hotplug support
+	insinto /etc/hotplug/usb
+	newins ${S}/packaging/linux-hotplug/usbcam.console usbcam
+	chmod +x ${D}/etc/hotplug/usb/usbcam
+	
+	HOTPLUG_USERMAP="${D}/etc/hotplug/usb/usbcam.usermap"
+	${D}/usr/lib/libgphoto2/print-usb-usermap >> ${HOTPLUG_USERMAP}
+}
diff --git a/media-libs/libgphoto2/metadata.xml b/media-libs/libgphoto2/metadata.xml
index da6fd63d0085..e5f0495c7a9b 100644
--- a/media-libs/libgphoto2/metadata.xml
+++ b/media-libs/libgphoto2/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<maintainer><email>liquidx@gentoo.org</email></maintainer>
 </pkgmetadata>