version bump

10 files changed, 183 insertions, 7 deletions

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 4c648a3b6840..e3b4e1d1dc5a 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gphoto2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.14 2003/07/09 16:43:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.15 2003/08/28 04:00:08 liquidx Exp $
+
+*gphoto2-2.1.2 (28 Aug 2003)
+
+  28 Aug 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.2.ebuild,
+  metadata.xml:
+  version bump, add maintainer
 
   09 Jul 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.1-r1.ebuild:
   added pkgconfig dep
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 1622d8e3891b..943922360423 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,9 +1,9 @@
-MD5 a3e03195a52da101fe49f7d9a79f2f6e ChangeLog 2674
+MD5 3ed4b3f97ab65680082a141c9ad554ca ChangeLog 2823
 MD5 16afb17229f53d6aae5da5804507e800 gphoto2-2.0-r1.ebuild 1146
 MD5 63cc8134b8d4637a8d4f1182fefbf6d3 gphoto2-2.1.0.ebuild 1135
 MD5 8c30e65688e077d80fd73dc06656cfe2 gphoto2-2.1.1-r1.ebuild 1643
-MD5 bf3d5841c64421c9812478e9fe1b1c05 gphoto2-2.1.2.ebuild 1644
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 4bbdbd61289315e22f9e3380eeb5314d gphoto2-2.1.2.ebuild 1642
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 51b5a71b2ed7d53c04e5e3daac55ddf7 files/digest-gphoto2-2.0-r1 64
 MD5 c6b8e82b0fa2b033d67aad22c1eebaf3 files/digest-gphoto2-2.1.0 66
 MD5 c3967212175ba0688697980155c735d2 files/digest-gphoto2-2.1.1-r1 66
diff --git a/media-gfx/gphoto2/files/digest-gphoto2-2.1.2 b/media-gfx/gphoto2/files/digest-gphoto2-2.1.2
new file mode 100644
index 000000000000..a1e2333eae46
--- /dev/null
+++ b/media-gfx/gphoto2/files/digest-gphoto2-2.1.2
@@ -0,0 +1 @@
+MD5 322999934ac09df43747dadafacb7a5e gphoto2-2.1.2.tar.bz2 280153
diff --git a/media-gfx/gphoto2/gphoto2-2.1.2.ebuild b/media-gfx/gphoto2/gphoto2-2.1.2.ebuild
new file mode 100644
index 000000000000..ff7518f6e8a0
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.1.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.2.ebuild,v 1.1 2003/08/28 04:00:08 liquidx Exp $
+
+inherit libtool flag-o-matic
+
+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 jpeg readline ncurses aalib"
+
+# jpeg useflag -> exif support
+# aalib -> needs libjpeg
+RDEPEND=">=dev-libs/libusb-0.1.6
+	dev-libs/popt
+	>=media-libs/libgphoto2-2.1.1-r2
+	ncurses? ( dev-libs/cdk )
+	aalib? ( media-libs/aalib 
+		media-libs/jpeg )
+	jpeg? (	media-libs/libexif )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_compile() {
+	elibtoolize
+	
+	aclocal
+	# -pipe does no work
+	filter-flags -pipe
+
+	local myconf
+	use nls \
+		|| myconf="${myconf} --disable-nls"
+
+	# command-line frontend
+	use ncurses \
+		&& myconf="${myconf} --with-cdk-prefix=/usr" \
+		|| myconf="${myconf} --without-cdk"
+
+	use aalib \
+		&& myconf="${myconf} --with-jpeg-prefix=/usr" \
+		|| myconf="${myconf} --without-aalib --without-jpeg"
+		
+	use jpeg \
+		&& myconf="${myconf} --with-exif-prefix=/usr" \
+		|| myconf="${myconf} --without-exif" 
+		
+	use readline \
+		||  myconf="${myconf} --without-readline"
+
+	econf ${myconf}
+	emake || die
+}
+
+src_install() {
+	einstall \
+		gphotodocdir=${D}/usr/share/doc/${PF} \
+		HTML_DIR=${D}/usr/share/doc/${PF}/sgml \
+		|| die
+
+	dodoc ChangeLog NEWS* README AUTHORS COPYING
+	rm -rf ${D}/usr/share/doc/${PF}/sgml/gphoto2
+}
diff --git a/media-gfx/gphoto2/metadata.xml b/media-gfx/gphoto2/metadata.xml
index da6fd63d0085..e5f0495c7a9b 100644
--- a/media-gfx/gphoto2/metadata.xml
+++ b/media-gfx/gphoto2/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>
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 47eccc23c05b..b0446bc59808 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.8 2003/08/20 16:44:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.9 2003/08/28 03:58:49 liquidx Exp $
+
+*libgphoto2-2.1.2 (28 Aug 2003)
+
+  28 Aug 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.2.ebuild,
+  files/libgphoto2-2.1.2-norpm.patch:
+  version bump with additions for usb hotplug permission support
 
 *libgphoto2-2.1.1-r3 (20 Aug 2003)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 4524d8d6050f..dd00bd3318ec 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,9 +1,10 @@
-MD5 ed26dcecdf3988906b6d5736a2b329c4 ChangeLog 1560
+MD5 871504e5a00b7af0a32ba6d095aaa843 ChangeLog 1771
 MD5 f3bc84b09c705f02e55251e24c3488a9 libgphoto2-2.1.1-r2.ebuild 1398
 MD5 192ed79a1946fdb0ae7b8f5bdcff8cbb libgphoto2-2.1.1-r3.ebuild 1968
-MD5 192ed79a1946fdb0ae7b8f5bdcff8cbb libgphoto2-2.1.2.ebuild 1968
+MD5 f8d49d6d9db583007babf3b7fb624823 libgphoto2-2.1.2.ebuild 1965
 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 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2 70
 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
+MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2
new file mode 100644
index 000000000000..32136093447d
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2
@@ -0,0 +1 @@
+MD5 ded0d8262d02e4c215ffc0d73d5acbbb libgphoto2-2.1.2.tar.bz2 1743528
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.2-norpm.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.2-norpm.patch
new file mode 100644
index 000000000000..32629b06d7e8
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.1.2-norpm.patch
@@ -0,0 +1,18 @@
+--- libgphoto2-2.1.2/configure	2002-12-01 21:46:42.000000000 +0000
++++ libgphoto2-2.1.2/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
++# remove rpm -q test to avoid breaking sandbox
+   RPM_LIBUSB_DEVEL_TRUE=
+   RPM_LIBUSB_DEVEL_FALSE='#'
+-else
+-  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.2.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild
new file mode 100644
index 000000000000..41f8605f932b
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.2.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.2.ebuild,v 1.1 2003/08/28 03:58:49 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}
+}