10 files changed, 25 insertions, 153 deletions
diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 4f1cb2d45dbe..f175d80f99e3 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gphoto2
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.30 2005/05/09 00:26:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.31 2005/06/24 15:10:19 liquidx Exp $
+
+*gphoto2-2.1.6 (24 Jun 2005)
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org> -gphoto2-2.1.1-r1.ebuild,
+  -gphoto2-2.1.2.ebuild, -gphoto2-2.1.3.ebuild, gphoto2-2.1.5.ebuild,
+  +gphoto2-2.1.6.ebuild:
+  version bump (#96879)
 
   08 May 2005; Aron Griffis <agriffis@gentoo.org> gphoto2-2.1.4.ebuild:
   stable on ia64
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 856fa110f8a1..9c6a747d58c6 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,12 +1,14 @@
-MD5 d896247c44cce66d239a5012eb42a20f gphoto2-2.1.5.ebuild 1713
-MD5 700847ed391acb0a68c257a9733633b5 gphoto2-2.1.2.ebuild 1654
-MD5 945eaa358382c7b7da3c353826053e9f gphoto2-2.1.4.ebuild 1662
+MD5 ea66acae7f28af76b88a0459ebec4da6 ChangeLog 4419
 MD5 c1b6a5f68e33cfd108bbaadacd907482 gphoto2-2.1.1-r1.ebuild 1650
+MD5 700847ed391acb0a68c257a9733633b5 gphoto2-2.1.2.ebuild 1654
 MD5 d7b12401338c955010ce8af19950f06b gphoto2-2.1.3.ebuild 1655
-MD5 ea66acae7f28af76b88a0459ebec4da6 ChangeLog 4419
+MD5 945eaa358382c7b7da3c353826053e9f gphoto2-2.1.4.ebuild 1662
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 4ae1673819068d11f6a259972b9604fd gphoto2-2.1.5.ebuild 1712
+MD5 d896247c44cce66d239a5012eb42a20f gphoto2-2.1.6.ebuild 1713
+MD5 c3967212175ba0688697980155c735d2 files/digest-gphoto2-2.1.1-r1 66
 MD5 520a73692fdd0ba51a0291f4344a27eb files/digest-gphoto2-2.1.2 66
 MD5 491b384e9ac759ba8ad7aaa954bdbf51 files/digest-gphoto2-2.1.3 66
 MD5 41665ec8402a0bb20d2b6112fd707870 files/digest-gphoto2-2.1.4 66
 MD5 140f74b092e17be74411552ab8821e55 files/digest-gphoto2-2.1.5 65
-MD5 c3967212175ba0688697980155c735d2 files/digest-gphoto2-2.1.1-r1 66
+MD5 3a36c3b5451b1f4d0452bf3ea8789e9f files/digest-gphoto2-2.1.6 65
diff --git a/media-gfx/gphoto2/files/digest-gphoto2-2.1.1-r1 b/media-gfx/gphoto2/files/digest-gphoto2-2.1.1-r1
deleted file mode 100644
index 69902ae090b0..000000000000
--- a/media-gfx/gphoto2/files/digest-gphoto2-2.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce77b9c9ce25a57990c61f9e301e74b9 gphoto2-2.1.1.tar.bz2 274275
diff --git a/media-gfx/gphoto2/files/digest-gphoto2-2.1.2 b/media-gfx/gphoto2/files/digest-gphoto2-2.1.2
deleted file mode 100644
index a1e2333eae46..000000000000
--- a/media-gfx/gphoto2/files/digest-gphoto2-2.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 322999934ac09df43747dadafacb7a5e gphoto2-2.1.2.tar.bz2 280153
diff --git a/media-gfx/gphoto2/files/digest-gphoto2-2.1.3 b/media-gfx/gphoto2/files/digest-gphoto2-2.1.3
deleted file mode 100644
index 7c1fbe99544c..000000000000
--- a/media-gfx/gphoto2/files/digest-gphoto2-2.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c5efceca67f4a67b9fa888609af2a03 gphoto2-2.1.3.tar.bz2 329025
diff --git a/media-gfx/gphoto2/files/digest-gphoto2-2.1.6 b/media-gfx/gphoto2/files/digest-gphoto2-2.1.6
new file mode 100644
index 000000000000..880b0a52bb0e
--- /dev/null
+++ b/media-gfx/gphoto2/files/digest-gphoto2-2.1.6
@@ -0,0 +1 @@
+MD5 2de2bcc62599b8a7337b54b0a067c50b gphoto2-2.1.6.tar.gz 617432
diff --git a/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild
deleted file mode 100644
index 83677757ef4e..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.1-r1.ebuild,v 1.12 2005/01/13 15:38:28 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} || die "econf failed"
-	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/gphoto2-2.1.3.ebuild b/media-gfx/gphoto2/gphoto2-2.1.3.ebuild
deleted file mode 100644
index d2d49afcf3d8..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.3.ebuild,v 1.8 2005/01/13 15:38:28 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 amd64 ia64"
-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.3
-	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} || die "econf failed"
-	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/gphoto2-2.1.5.ebuild b/media-gfx/gphoto2/gphoto2-2.1.5.ebuild
index 94685127fc6a..266a04af7c52 100644
--- a/media-gfx/gphoto2/gphoto2-2.1.5.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.5.ebuild,v 1.3 2005/03/30 20:37:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.5.ebuild,v 1.4 2005/06/24 15:10:19 liquidx Exp $
 
 inherit libtool flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ia64 ~ppc64 ~alpha"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="nls jpeg readline ncurses aalib"
 
 # jpeg useflag -> exif support
diff --git a/media-gfx/gphoto2/gphoto2-2.1.2.ebuild b/media-gfx/gphoto2/gphoto2-2.1.6.ebuild
index b2d6c503a529..49bac7230acb 100644
--- a/media-gfx/gphoto2/gphoto2-2.1.2.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.1.6.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # 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.10 2005/01/13 15:38:28 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.6.ebuild,v 1.1 2005/06/24 15:10:19 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"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ia64 ~ppc64 ~alpha"
 IUSE="nls jpeg readline ncurses aalib"
 
 # jpeg useflag -> exif support
 # aalib -> needs libjpeg
-RDEPEND=">=dev-libs/libusb-0.1.6
+RDEPEND=">=dev-libs/libusb-0.1.8
 	dev-libs/popt
-	>=media-libs/libgphoto2-2.1.2-r1
+	>=media-libs/libgphoto2-2.1.6
 	ncurses? ( dev-libs/cdk )
 	aalib? ( media-libs/aalib
 		media-libs/jpeg )
@@ -31,7 +31,8 @@ src_compile() {
 
 	aclocal
 	# -pipe does no work
-	filter-flags -pipe
+	# liquidx: why doesn't it work? bug #?
+	# filter-flags -pipe
 
 	local myconf
 	use nls \