Prevent maintainer-mode (#491708 by Nikoli), drop old.

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

3 files changed, 9 insertions, 53 deletions

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 1712dc00665b..9045e32e318f 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gphoto2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.133 2013/08/14 14:35:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.134 2013/11/22 20:06:15 pacho Exp $
+
+  22 Nov 2013; Pacho Ramos <pacho@gentoo.org> -gphoto2-2.5.0.ebuild,
+  gphoto2-2.5.2.ebuild:
+  Prevent maintainer-mode (#491708 by Nikoli), drop old.
 
   14 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   gphoto2-2.5.2.ebuild:
diff --git a/media-gfx/gphoto2/gphoto2-2.5.0.ebuild b/media-gfx/gphoto2/gphoto2-2.5.0.ebuild
deleted file mode 100644
index 5d0d6d3ec407..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.0.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.5.0.ebuild,v 1.1 2012/07/21 11:28:20 pacho 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.5.0[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.14.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.2.ebuild
index 9e7354a9eff0..61b4ca453551 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.2.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 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.2 2013/08/14 14:35:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.5.2.ebuild,v 1.3 2013/11/22 20:06:15 pacho Exp $
 
 EAPI="5"
+inherit autotools
 
-DESCRIPTION="free, redistributable digital camera software application"
+DESCRIPTION="Free, redistributable digital camera software application"
 HOMEPAGE="http://www.gphoto.org/"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
@@ -35,7 +36,7 @@ src_prepare() {
 	# Leave GCC debug builds under user control
 	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
 		-i configure{.ac,} || die
-
+	eautoreconf
 }
 
 src_configure() {