added exif support

9 files changed, 173 insertions, 5 deletions

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 8a18f02dbdc5..08b8332d8c6b 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2003/02/12 15:46:59 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.10 2003/05/11 11:12:33 liquidx Exp $
+
+*gphoto2-2.1.1-r1 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.1-r1.ebuild:
+  added optional exif support. Bug #12044.
 
 *gphoto2-2.1.1 (12 feb 2003)
   
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index e488a65af077..26218935abbb 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,7 +1,9 @@
-MD5 ba472372f75d2b0a3742a60479023bb8 ChangeLog 2119
+MD5 97573a227198227647d03b29eb0eb5f3 ChangeLog 2272
 MD5 89cd61f0f169d2db621dbf268c12eafa gphoto2-2.0-r1.ebuild 1147
 MD5 3ae454f193ec732c74c616b57c861f61 gphoto2-2.1.0.ebuild 1168
+MD5 de0764bb9418ab97db8824992a8d49ec gphoto2-2.1.1-r1.ebuild 1628
 MD5 0923b7f9662cf135411a6174334312ef gphoto2-2.1.1.ebuild 1315
 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 66
+MD5 c3967212175ba0688697980155c735d2 files/digest-gphoto2-2.1.1-r1 66
diff --git a/media-gfx/gphoto2/files/digest-gphoto2-2.1.1-r1 b/media-gfx/gphoto2/files/digest-gphoto2-2.1.1-r1
new file mode 100644
index 000000000000..69902ae090b0
--- /dev/null
+++ b/media-gfx/gphoto2/files/digest-gphoto2-2.1.1-r1
@@ -0,0 +1 @@
+MD5 ce77b9c9ce25a57990c61f9e301e74b9 gphoto2-2.1.1.tar.bz2 274275
diff --git a/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..b87cf1e62d81
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild,v 1.1 2003/05/11 11:12:33 liquidx Exp $
+
+inherit libtool flag-o-matic
+
+IUSE="nls jpeg readline ncurses aalib"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="free, redistributable digital camera software application"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+HOMEPAGE="http://www.gphoto.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+# jpeg useflag -> exif support
+# aalib -> needs libjpeg
+DEPEND=">=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 )"
+
+
+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-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index ddb0c9eaf6e1..87a349d3aa4c 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.2 2003/02/13 05:59:58 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.3 2003/05/11 11:09:29 liquidx Exp $
+
+*libgphoto2-2.1.1-r2 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.1-r2.ebuild,
+  files/libgphoto2-2.1.1-norpm.patch:
+  added optional exif support. Bug #12044.
 
 *libgphoto2-2.1.1-r1 (12 Feb 2002)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 441a6aabb2d3..9b1a11d75d2b 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,6 +1,8 @@
-MD5 5b042c320abad17656620c8bf6ba27ce ChangeLog 655
+MD5 fc0950d7e014936f2200481526e79931 ChangeLog 851
 MD5 1faae7f3a1fa6abb4a9b8ff930020f65 libgphoto2-2.1.1.ebuild 1092
-MD5 1cc3c7285939a0c9831adee61177128f libgphoto2-2.1.1-r2.ebuild 1294
+MD5 ac8c8781c7c55aa61bab3956e21d2c8d libgphoto2-2.1.1-r2.ebuild 1363
+MD5 09a43d557eac04c25c812e537dbd0497 libgphoto2-2.1.1-r1.ebuild 1091
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1 70
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r1 70
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r2 70
+MD5 8199b8756906a672bbbbaa181e82679c files/libgphoto2-2.1.1-norpm.patch 541
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r2 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r2
new file mode 100644
index 000000000000..0504917e8f6d
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r2
@@ -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
new file mode 100644
index 000000000000..09ad53119489
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch
@@ -0,0 +1,19 @@
+--- 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 @@
+ # 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='#'
+-else
++# don't let rpm -q run or else it'll break sandbox.
+   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-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..d31259a60aec
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild,v 1.1 2003/05/11 11:09:29 liquidx Exp $
+
+inherit libtool
+inherit flag-o-matic
+MAKEOPTS="-j1"
+# or the documentation fails. bah!
+
+IUSE="nls doc jpeg"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="free, redistributable digital camera software application"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+HOMEPAGE="http://www.gphoto.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND=">=dev-libs/libusb-0.1.6
+	jpeg? ( >=media-libs/libexif-0.5.9 )
+ 	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"
+	
+	use nls \
+		|| myconf="${myconf} --disable-nls"
+	
+ 	use doc \
+		&& myconf="${myconf} --enable-docs" \
+		|| myconf="${myconf} --disable-docs"
+		
+	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 TESTERS MAINTAINERS HACKING CHANGES
+	rm -rf ${D}/usr/share/doc/${PF}/sgml/gphoto2
+}