Version bump, drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 11 insertions, 56 deletions

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 94d121e9c287..7a0b925b45d9 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gphoto2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.148 2014/05/17 15:31:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.149 2014/05/21 18:33:47 pacho Exp $
+
+*gphoto2-2.5.4 (21 May 2014)
+
+  21 May 2014; Pacho Ramos <pacho@gentoo.org> +gphoto2-2.5.4.ebuild,
+  -gphoto2-2.4.14.ebuild, -gphoto2-2.5.2.ebuild:
+  Version bump, drop old
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> gphoto2-2.5.3.ebuild:
   Stable for alpha, wrt bug #508862
diff --git a/media-gfx/gphoto2/gphoto2-2.4.14.ebuild b/media-gfx/gphoto2/gphoto2-2.4.14.ebuild
deleted file mode 100644
index 8b3300bd7024..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.4.14.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.14.ebuild,v 1.8 2012/10/28 16:02:36 armin76 Exp $
-
-EAPI="4"
-
-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="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-# raise libgphoto to get a proper .pc
-RDEPEND="virtual/libusb:0
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.4.14[exif?]
-	ncurses? ( dev-libs/cdk )
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.18.1 )"
-
-src_configure() {
-	CPPFLAGS="-I/usr/include/cdk" econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with aalib) \
-		$(use_with aalib jpeg) \
-		$(use_with exif libexif auto) \
-		$(use_with ncurses cdk) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
-		install
-
-	dodoc ChangeLog NEWS* README AUTHORS
-	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
-}
diff --git a/media-gfx/gphoto2/gphoto2-2.5.2.ebuild b/media-gfx/gphoto2/gphoto2-2.5.4.ebuild
index 9be5d2f4cd07..38df893fe650 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.2.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.5.2.ebuild,v 1.6 2013/12/22 16:09:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.5.4.ebuild,v 1.1 2014/05/21 18:33:47 pacho Exp $
 
 EAPI="5"
 inherit autotools
@@ -11,15 +11,13 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
-# raise libgphoto to get a proper .pc
 RDEPEND="
 	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.2[exif?]
-	virtual/libusb:0
+	>=media-libs/libgphoto2-2.5.4[exif?]
 	aalib? (
 		media-libs/aalib
 		virtual/jpeg:0 )