bump to 2.4.1 with a fix for bug #194929. Clean up old revisions.

Package-Manager: portage-2.1.4.4

6 files changed, 76 insertions, 209 deletions

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 1f13a1c310e1..6e9ede28430f 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gphoto2
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.56 2007/10/07 13:13:57 eva Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.57 2008/03/30 21:30:21 eva Exp $
+
+*gphoto2-2.4.1 (30 Mar 2008)
+
+  30 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> -gphoto2-2.1.4.ebuild,
+  -gphoto2-2.1.5.ebuild, -gphoto2-2.1.6.ebuild, +gphoto2-2.4.1.ebuild:
+  bump to 2.4.1 with a fix for bug #194929. Clean up old revisions.
 
   07 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> gphoto2-2.4.0.ebuild:
   raising libgphoto dependency per bug #194929
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index f048708cb0e0..92f5a94f2fef 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,14 +1,20 @@
-DIST gphoto2-2.1.4.tar.bz2 350858 RMD160 0e2040ac41713a43ae3e2f7eb85ba0ca6864163d SHA1 7a42905c366c91a90952c5a7b4e709b7aef1b0f0 SHA256 c52e77a52ad11a02ae9f0b8491915f3f09fec23f8f740cc6079570241caf63cb
-DIST gphoto2-2.1.5.tar.gz 535490 RMD160 b4c63fe0e7cb0bc4173a8b5d2c9957b056ebba51 SHA1 74a99135ed6d19d4296afe986b1b50244d67c5fc SHA256 fefaabea8aede51ae9560ba71e2a7c31f4d856b0bb1fc0de7297d12e1215698c
-DIST gphoto2-2.1.6.tar.gz 617432 RMD160 4b7df21b93a91c45560eaa129a4d92bd4985d770 SHA1 73385db3cd90174a8489b61f3c5ff00823ef5781 SHA256 82330519effc421a39c196d2a2806dc9c3cdcc891b7ec34dee04b3fe4ef4534a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gphoto2-2.2.0.tar.gz 831730 RMD160 8714914120f87b0f40bf9bd480f17dedfd07f4ab SHA1 d2793f31a9cf2a21288d9bb81868976ab396df2a SHA256 966e015327ccb67e4b076114b967496e2b1a807aa0f6d35e52caf69ec4b33660
 DIST gphoto2-2.3.1.tar.gz 841541 RMD160 e2938b146e64f948d4a6b5f2d7058503addb9731 SHA1 38e4180fcf57d2107b95cdd872749368cdb79e37 SHA256 38adb1c83061e4ae5aed2ebd10cb4606ced028ce9b280d7fd7ff9a72d9bd0507
 DIST gphoto2-2.4.0.tar.gz 866020 RMD160 624ef68092ccf6b6b512a2a1db03dcf586ef4a33 SHA1 8eece0100816e3126251cdea95eec5759a84557e SHA256 ceb8d5c2466d79a81ce915253bcb6a73b7c6b5f855ae8db1af9e2fc138f22b15
-EBUILD gphoto2-2.1.4.ebuild 1661 RMD160 b0a5e21561b7893b00336c9325ee6cfebaba62fe SHA1 facfd6fe92ec31d1baf733d3b7857fec71675e81 SHA256 9569b8ae095d9340267b80d0992c70591f273a767d50400606eae92fd5947d71
-EBUILD gphoto2-2.1.5.ebuild 1708 RMD160 669c98bc89c4a81f1cd4ee670ac9c4dc9539edcb SHA1 6e58d130bef4584ffb29e33e1e8546a5e155f2b1 SHA256 4a5c00331a2d224a929a478200ea2a6e3fc9512ec0ed1e5e30c775956acbee2d
-EBUILD gphoto2-2.1.6.ebuild 1654 RMD160 4699329aedaad699b3656475f0dce0e4a394a857 SHA1 51755c0797dc0394c283900cc477fde213bafbd2 SHA256 41fe3b596cfc95a1ceeb520016a25ba848a5de1642210ee2f7d3109291e0b20f
+DIST gphoto2-2.4.1.tar.gz 878192 RMD160 124c2a0d6c577c5fbe80dbe2a4d3dcd6d64e4216 SHA1 e8f62ae94b9bd3d2c6193b8eb1ee0eb7e2977bfd SHA256 74a3d2fbc9108acafa2a221c6e18981bf8c30e1c67eda8fb961575c308f4f554
 EBUILD gphoto2-2.2.0.ebuild 1230 RMD160 4a744a60eb9fe13af773d54a014173e0ee96c780 SHA1 c3be155791adbc7d375f9fe1e7d28a7bdbbbd64e SHA256 8c8cfb72b0eed2b020b6bc8117abc1e82305952c3f3aaa6e2d09ea0844d6cbff
 EBUILD gphoto2-2.3.1.ebuild 1236 RMD160 6b0deaa55731006f85812bbdd94ce534a6c12458 SHA1 22b5cee19e8bb5ac9f3e9c0da3278b6f739d55d9 SHA256 de701ebc1578677390b4ad4aef5b19d3ff63fae19322f50fb9c5881a3b5751ad
 EBUILD gphoto2-2.4.0.ebuild 1282 RMD160 84db242610c20fa85ce2552fe04e8127081e4635 SHA1 5f268341a884e39d51cff9729caee19c53a76982 SHA256 ce4d3bd829cd11559751b5cd9ab9c7bd1c7495e4c934daa784ad8bb2bc53c20d
-MISC ChangeLog 7506 RMD160 72d9d5bc3188628ab2a650cf03bb1847b33e91fe SHA1 a439067368a5b10966b124aac82bd18eaf15e8e4 SHA256 da363d72436664d092537eb2be99c7f0752e1f66dd0941c4dd23b30549205231
+EBUILD gphoto2-2.4.1.ebuild 1547 RMD160 13d87586cdb6d3de4734f78fe550ddd531e1b6ef SHA1 b4279c1a1738fb4680ae0d69e702dfaaf83d3a3c SHA256 68ead29974c69e2491deb9b64f840dc0c4c4fc87694a0356941dcc36b533f510
+MISC ChangeLog 7753 RMD160 882a0fbb6371c4e7719e37052d6d163831bebbb9 SHA1 376c05a4622904b9ef1e7cd616f32e4aa81e9e08 SHA256 059bcdb4c6de3b89a3b0272af8d41b3c529d5dddb016ce4feb2b0ec8a69a0209
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkfwBnYACgkQ1fmVwcYIWAYE4gCgghxq/1B+TROpJBZ3+3qxwRe/
+CaAAnA5fDOzMsHm72iXp4g8Is4mE8rG7
+=p7kY
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gphoto2/gphoto2-2.1.4.ebuild b/media-gfx/gphoto2/gphoto2-2.1.4.ebuild
deleted file mode 100644
index 7c91a1f04302..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.1.4.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.4.ebuild,v 1.12 2005/11/03 21:25: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="amd64 ia64 ppc ppc64 sparc x86"
-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() {
-	aclocal
-	elibtoolize
-
-	# -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
deleted file mode 100644
index 83569853887a..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.1.5.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.5.ebuild,v 1.9 2005/11/03 21:25: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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ia64 ppc ppc64 sparc x86"
-IUSE="nls jpeg readline ncurses aalib"
-
-# jpeg useflag -> exif support
-# aalib -> needs libjpeg
-RDEPEND=">=dev-libs/libusb-0.1.8
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.1.5
-	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() {
-	aclocal
-	# -pipe does no work
-	# liquidx: why doesn't it work? bug #?
-	# filter-flags -pipe
-	elibtoolize
-
-	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.6.ebuild b/media-gfx/gphoto2/gphoto2-2.1.6.ebuild
deleted file mode 100644
index 6ec4f164fba0..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.1.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.6.ebuild,v 1.7 2006/12/20 21:59:25 zzam Exp $
-
-DESCRIPTION="free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ppc64 ~sparc ~x86"
-IUSE="nls exif readline ncurses aalib"
-
-# jpeg useflag -> exif support
-# aalib -> needs libjpeg
-RDEPEND=">=dev-libs/libusb-0.1.8
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.1.6
-	ncurses? ( dev-libs/cdk )
-	aalib? ( media-libs/aalib
-		media-libs/jpeg )
-	exif? (	media-libs/libexif )
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	# -pipe does no work
-	# liquidx: why doesn't it work? bug #?
-	# 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 exif \
-		&& 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.4.1.ebuild b/media-gfx/gphoto2/gphoto2-2.4.1.ebuild
new file mode 100644
index 000000000000..0e21fb04ee39
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.1.ebuild,v 1.1 2008/03/30 21:30:21 eva Exp $
+
+DESCRIPTION="free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+
+# aalib -> needs libjpeg
+# raise libgphoto to get a proper .pc
+RDEPEND=">=dev-libs/libusb-0.1.8
+	dev-libs/popt
+	>=media-libs/libgphoto2-2.4.1
+	ncurses? ( dev-libs/cdk )
+	aalib? ( media-libs/aalib
+		media-libs/jpeg )
+	exif? (	media-libs/libexif )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14 )"
+
+pkg_setup() {
+	if use exif && ! built_with_use exif media-libs/libgphoto2; then
+		eerror "exif support required but libgphoto2 does not have it."
+		die "rebuild media-libs/libgphoto2 with USE=\"exif\"."
+	fi
+}
+
+src_compile() {
+	econf \
+		$(use_with aalib) \
+		$(use_with aalib jpeg) \
+		$(use_with exif) \
+		$(use_with ncurses cdk) \
+		$(use_enable nls) \
+		$(use_with readline) || die "econf failed"
+	emake || die "compilation failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		gphotodocdir="${D}"/usr/share/doc/${PF} \
+		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
+		install || die "installation failed"
+
+	dodoc ChangeLog NEWS* README AUTHORS
+	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
+}