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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 15 insertions, 65 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/Manifest b/media-gfx/gphoto2/Manifest
index 7fa10a2d4578..596b4839bd23 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -2,21 +2,15 @@
 Hash: SHA256
 
 DIST gphoto2-2.4.14.tar.bz2 669292 SHA256 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123 SHA512 dc60a8e878d4481995f7d3a575c74b3857b03cfa6fcde6e189da9db070b30154d2a346653eea62be9ccf99784c5bbe87e08adeb508750c91f22fca5c12016418 WHIRLPOOL 97a4a7120cd2ba1b5e11bb741aa1132c4b6cdec7ebe5b5e1a82cff2dc7ee0259cc3f7601443ac68e78ba4857c5383d8e5bf6430514c81de09da45a32c56d4ab4
-DIST gphoto2-2.5.0.tar.bz2 693115 SHA256 5593cfe0e729812167474f839b0741c1028de7bf922cdc443617f15d3ed3a47d SHA512 2efd161d4e8ae219ca14e43e6921707ef1c62e7956d8ac3fa353578abaceccd8eb253024743bb63b31732dddac3ee039f6de157b0188427579b0752b7d51c2e5 WHIRLPOOL 9c7ce8c0c100bbfa112dae5b00d1d3f4eea67d0badafdd5a905b49ed43101fdd9211187e9d618a3ea383346b6fab90b27c2356b721828bc75d27b216bc916e7b
 DIST gphoto2-2.5.2.tar.bz2 720529 SHA256 8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899 SHA512 f9279471c207b2a6da5db4a8eac823e60daba358b5643ece294cb062a543e055fa0222a1842d3d56c9b93f96a358e37310ca3f338647c6232df4c6024d641bde WHIRLPOOL 73747dde5911b64d4be7529441d9d20dbb2034ebb01305eedda3f1242e0c3c50db8081a1e7ed474ace9b3c356f4f85a585075a32734a4e4add6f35c5f2aa5aae
 EBUILD gphoto2-2.4.14.ebuild 1297 SHA256 3d2f8cca5ec2a15b43785cf95bc663652e61996f4bb920a96d2c3a4439b48d75 SHA512 306b0e8c6da0585cd0e2be22b6e63ebe559e4808fcb5d439c2c1b12a4e4fe740e7b1ee0560e90435d51f25ea44716ea9823a2b56c0cca9292214ceeca6ada0ef WHIRLPOOL 6501799f6f949302026f7e41db9e2803a5e857081038e0e1bc74e3d5ccdf8519089340e793acdc7d3d29650715bc613adf1d969679d6a6f55739160ffa7f6ebc
-EBUILD gphoto2-2.5.0.ebuild 1300 SHA256 5e4dbfb630707b55ff0bf2fcd95bf9f778eee34a105e347ade9126c8069cd6a4 SHA512 10cad04e59e78fa72a36a160755c33eb4794fba862983836b0dc9f488e38a3f530c2a3aa36b8684ec875163b278e9e44d47fee482a6c1845692e6664872f903f WHIRLPOOL 7c5649b9b6a2cf397de887311aec8081ae44eec0708aacef3a32b1a0a379979e41d22a39c3c9703863e531bbec59e4cb7a200cc1a283ba63d6b76abfaf16ef45
-EBUILD gphoto2-2.5.2.ebuild 1442 SHA256 1d8e0fdc596a10c583dc74f160db194a7df0864164633da66b5dec208f64f0de SHA512 7317ce0e799ed78fe36c2455ee0a20af4ac573fd5970cbd7e1601bc9d9bec266e62c2249724ecb75f1a9c95884e9388fe9c2c46ed9b256f57c38c8dbde0d86a6 WHIRLPOOL 9bb5caa6b1a3dd5b8b58cef10a3fc6af180734cc37596785e6574a1eff7e193f252e5388914df15aabb3fe08518716f274f0db47990d779f5311d0c15b434a62
-MISC ChangeLog 17324 SHA256 80b3dc75f8cd360e6202f81319e869ce88483038ef146bed69a345d35e121780 SHA512 fc96138292ee6ec3ca348c9f4bb0fc4eab2745163672a2a7292973a835b6444a252b4086b57fe3346313d7bebfa91fb056204f6d2db8af36c691e2a8a05940f6 WHIRLPOOL c7688f96e756150ab859fba2b5b8fac867e8bb94eb824ff005a3b65d7044bdb07fc668045d7b2529af5c2f7191f936fff0fbfa959d48f486d73e0d51b4e82a7c
+EBUILD gphoto2-2.5.2.ebuild 1468 SHA256 e4bab86e855eb6e85dc12048c716204efacd0bb2761fdbe8919990024072e641 SHA512 0606be9a8de38df95fde2072ff91307f58317914d3ab55600cb8db71d38e1ad6da158b31a3ac46ac0d27f58a014af19a0f9790ac0df7c63027eda34de745a6df WHIRLPOOL bd828b55e5d40aa03b552778f14d77dd494d1d1bb9caa3076d86ed7e7bc4de7fc35fc72d33d2c6260598f9b822f4014f4639f9a8b1eaa2cb38bfbc6c7e3db123
+MISC ChangeLog 17471 SHA256 9d44be66895c4dae3b72c39ad926737e12add4b984a9cf069b1d40d63d41146c SHA512 9df80c7abce620e8f25ada8dfe77d642116a0885938219f2b11ed96801c377440f8ff39583c44c9033a9e1c1baa6bbf1e3db5bdcab02ae867118bc088d026e5e WHIRLPOOL 341ebcdc8e5169d72f874b8d239d558c273edfd1226e85d4eec92f27c80bda4735f1fb9d90ed05f37d80a7250a362324041d9789e5ae2b073485bd4409370707
 MISC metadata.xml 182 SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b SHA512 6b61b8de171da5556ddf719a13a0053fdf6d26c891f6c7ffedebe51c3f88f6d2b15451e43819705841c6818d3a5cf4d2466c92b5a1ee654ca6e5de7436570859 WHIRLPOOL 5487cc56cd31c1326162f3b15018e1d43a0e42086480ee53f6893e8eeee63a27bbec99844f3de3d40ea8e6ab6721087831f398b761ea0c827ce56e4e1473b8f7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSC5XEAAoJEJ0WA1zPCt1hB7kH/jtkDIv4M2PgnAkXTa9trEou
-iSzox/ZQnbJu27lNQYmcdOFdeFj+OG8/wEYe+4AHoII4a/M8pb0dtitxxehC2a4j
-jkF3Sfe7Bt/aARYskFTJhzG7FX02MhQKCKc5vCQDEfKR5TtdNnAammJRYdgS8uc9
-RWz19N4RELslWUuC5zCOxYtZJAVJhoe5LipRiyL1FiKPZPZObizPdYSR9+9A742D
-m6BHG6AkiawBSVV+QqVj0YwcEBCoPCxwsEwLTcjfhrEeV2DMxXnMw9aPfHoDPmzU
-mgXT3ONBGy/3/MIw1IPKaHJ/UY2i5g8oOQIK7KrxKyHNBqo45VCSU2ipMhsWVUs=
-=fl8l
+iEYEAREIAAYFAlKPuTgACgkQCaWpQKGI+9QgUACfblKEWeT5C2DILJI3Fqtaq3sP
+PGMAoIY1eF2LpeEPz5EbSrnSonueUstA
+=Jr5z
 -----END PGP SIGNATURE-----
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() {