Bump, migrate to new eclasses, prune now broken old versions

Package-Manager: portage-2.2.0_alpha182/cvs/Linux x86_64

8 files changed, 19 insertions, 148 deletions

diff --git a/dev-db/barman/ChangeLog b/dev-db/barman/ChangeLog
index c98c92551a54..b84b7281ce4a 100644
--- a/dev-db/barman/ChangeLog
+++ b/dev-db/barman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/barman
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/ChangeLog,v 1.7 2013/05/24 08:41:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/ChangeLog,v 1.8 2013/06/20 03:35:23 patrick Exp $
+
+*barman-1.2.1 (20 Jun 2013)
+
+  20 Jun 2013; Patrick Lauer <patrick@gentoo.org> +barman-1.2.1.ebuild,
+  -barman-1.0.0.ebuild, -barman-1.1.0.ebuild, -barman-1.1.1.ebuild,
+  -barman-1.1.2.ebuild, -barman-1.2.0-r1.ebuild, -barman-1.2.0.ebuild:
+  Bump, migrate to new eclasses, prune now broken old versions
 
 *barman-1.2.0-r1 (24 May 2013)
 
diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest
index 987d5b782af6..4f9ae0fcc777 100644
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@@ -1,13 +1,4 @@
-DIST barman-1.0.0.tar.gz 53138 SHA256 dc157220cf0eab6698ebb5fc714deea429223a26aeb413c1d6f03c3a90572090 SHA512 3f205f161ef932c48c066e938b043c58ca62ea329265e3d974a0932a5070a9474c900926a78d7dbbc6510fac4f7ca52cc987901e7d87c529255166cc1e13f970 WHIRLPOOL 59de26dd9021f92c92f932bd072dc9c7080f3f5976a1c89b031e82beeed5fb771532c498c5c1d1d5f1cbc2544727f9f57b80394cb6c3552e4f3addc4440375fb
-DIST barman-1.1.0.tar.gz 56549 SHA256 ab176c1aea199c2a8314c781dcd5f733f513f0334e2f90f6dfbc3caf294c641e SHA512 eb2ce6979ab7729c31cddbd2bc93f74e2b9d1c5a9de4991902d44b395b8e62e742865bd8ae6c4ea05c87498eda5c167c1895314c945ef31932b658fbe8006625 WHIRLPOOL 293a28e32515f4c4956700f67c517789c18bde5ee15b1237b26d26135675bdb0561a5c6c611b45a1104bc0edeb5c2a5688bfbda3890a31995b034e9282b078ad
-DIST barman-1.1.1.tar.gz 56723 SHA256 1298beab5813ecbbaf054c3b781c0521bc8662876aa188893409e8c80819ec2a SHA512 58c22b0b68d6d198bc40815b38d4e05212768c9ba4fb196a05780c8c0bfd1e52e6bf8efc5b5e206dd889a80d0d02a2480b65d62a49f5f6374f208f00394df658 WHIRLPOOL 9877692eba4b6a707a80027235244df08d42836b70ce4d287efcedff725f851d2790255585626db309aeb14b0f5b0aba8a7179e694b8db3ffac706e1429b142d
-DIST barman-1.1.2.tar.gz 58910 SHA256 474d245cd08cec1ba3fc1f93e478ff115f5d00503c29aa9612018068b7752d3b SHA512 5da1807d5304847ebaf440604236d4956baeaa0f31ba9059316212df9b16f2721108ce7684ffa9f26787ea8b9a1a123ba7d54e270cb1d0bb237da6069bd73cca WHIRLPOOL ded87e02a6fe690d9b468129336d77d246e0d6b1fe9fe882756989e6ccb100e992e607d8e8de442217b0f4417b17af1a0bc0e764f8704f469448d867ce007e89
-DIST barman-1.2.0.tar.gz 67690 SHA256 4cca3106d855086f7f77735290afb09872b4f4b6065d831576333b52f5c078db SHA512 08403c528eeb0ee2a398af9058be4e1b0a3a2703d9109a09a66e9067898f17bf49a47f41809a5f5dba027a7c00025979aad4b0b948d3d9acf3666f6a862a1cad WHIRLPOOL dad434292a6bd47702f16eaa69968f1deb184dd2824bc012fe231abd02c5508235ebfbb3476003095c3148b4c1ed3f855e8433b26ea54630e07e96e7deae7d7b
-EBUILD barman-1.0.0.ebuild 623 SHA256 eedb5a0fd6645e665ad8764f4cfda134ad5a70ae1ce7f458aab5e6d9497fc4fe SHA512 15a3ecd67a48a11cdc6f652876275d4dd8aed670d088eb724441984a8e0ad16fc2350fa7f50f8e33c8bf73fc62ba3939325c442d26e0c4880e26b3cc6137d831 WHIRLPOOL 9b1802c94a0f5862c940bb1f58f1a8c6a653adef51c65539680e6001c1466547ad38a05fe04eeed72f2861ace82bf89b9c3cc85ac914ad9fd7606d2253982995
-EBUILD barman-1.1.0.ebuild 623 SHA256 bacdc86ca7c0b40aae6774ad2f38fdcee12ed1810f6b32b465fa1be947ca658c SHA512 32bec1bbfd444d206912ca85208d9fcbdde7d294cda18f07da138e57a040df330488ac74ff18d02af4e3f23ada38c98448a259d0ecf17aacf5571c77db182fb6 WHIRLPOOL be86caf79ab18b36361feb3c4c5f89dd1f91ae175f9a6bf0d5350ab3ed8d3e55071013beb645672c8cc353e969c1fb058e6a0acee801fe655f9dcfebd5a56a65
-EBUILD barman-1.1.1.ebuild 623 SHA256 f3cf5ec6aba6d07b0dfc0dbd818d8ad0525c709b36e176c7b4abae860157b404 SHA512 c55128599a15673b13f2a6cc2fc8394c8379fabe9f8d625d48488121dabedffe549e799969e6adb43ddae870c0e56c2b8f025f89dc9e44254449a3a43e37e768 WHIRLPOOL bf9cb59a08669692a701b025f6218abc17ea50fc99bd701d293f94e13388c80c36e5915541c4eeecae292228ce730e65ef845a623691bea3c96792a5b1a96847
-EBUILD barman-1.1.2.ebuild 623 SHA256 0e91f7333acf9c23e0884596be84621ed5dc9bad3d9fbe39a418461944b5ee61 SHA512 e3f53008ca08814ad5f59c15099397609c0aabb4a1b06930a2d56858f771d009541493392217ccbebeb6fcbcbca49fa9b8f78ad55cea47b2a27c0991e569b31f WHIRLPOOL 52216873d0a1dfb2acb9eeffd9234cfbf5ab77168c0580b0667ac449121d67b1e383b10b2f3c3a440b5f82bdfac8ac801a47385590a5ccca0f6bc77681524809
-EBUILD barman-1.2.0-r1.ebuild 781 SHA256 310ae7c579b59b6aa82ea7a3c7438051d22d4eb3fb9234cc0cb188cea067f82d SHA512 767046fc2a936869ebe54dcdb38695a4bcdad79967ce858f55ac111add66e3ebdfe1d289fd04f7d4898e08e24b74221712e3e5de77789b9b4a0ef48756ed6093 WHIRLPOOL 9555f589b7501f5208dd4b2a2c96cd40fe746d7a2df2539a37b5e2e05f97296abee7affbe3eff7b9163dfa3a7e1f4aaeb2297826038d208f7af3f286e99acc56
-EBUILD barman-1.2.0.ebuild 688 SHA256 05157ca995ca431eea933a4b8bb19b528defe19f6996e22ebfbd893436dc46c0 SHA512 373d101ec5d29178d3e48578a038fb5ee2836f5b36384ae2ef09633b369c7e63ac2012390bf5b03f4fa7589c687be66b1fe0d1b492f3d0dce413418165a0b2d0 WHIRLPOOL 6ea08fd4c6fc68ca32f06442fdaa4e97216bf83148ad8ce3430da057c861594d00acb837b52e79cb8f59bd437d5f624e22ab739bd530635df70212ea83830164
-MISC ChangeLog 1027 SHA256 e69236656da2aa14e8ba9ce0937056772e31be17684d4951ee457add8d77f5c1 SHA512 d807dd1dc04885e95101e67026b189bb328e28e42c624f4f66998c621ca07199a5f2eb90fee364583c7052c82ec00be3323c2f2c15d317ba68395ece1a39a327 WHIRLPOOL 8ed1e0d9321b1d953d076ab8174409adcc7c6223829e10e5fb9a6c7ccccddf0e33734dd14bbf2ff3ab56150520804a60c43408c0899355edbbdbeda7b5d46ccc
+DIST barman-1.2.1.tar.gz 70413 SHA256 7389b7c7e532e4b67adc2f606c74fcbdd3dc0c7284c16256da9a0e0a3a4f8060 SHA512 044b87570262ca8ac953ead93c87c1f75bea68214b6417a88e9d8df0af7feae9b22c77f695cfda89a555982d2c65dfe8fb212d18ab399828ddd8f883c8c49016 WHIRLPOOL 018cf64473ea22fcdadeb4c0fbb6e477a9bf2f08d99e1174a9252bd9482bc06d61c2f228666e6ac140b749f2576712cd7d82d1e0ee86583d7553abf456fc70cd
+EBUILD barman-1.2.1.ebuild 714 SHA256 b42d004160305caa53c6f7ac44e441ffb7c01e98e95f4702127d93ec15dcbf95 SHA512 9caa5d620fb778a1faca1d7e17d44c1ae49b9c988da8171246b4c9c95612d097b8b05a963a0ff5516f4087485f5cbc8f3fabce35ecce3790c069137c2d9e620b WHIRLPOOL 24fd8cf1dd901b7ea762ac360201e95150ac9e54e5ccc5484862d38f93c6af1f2eba3def460cacc9cdc216e074b5498083f96270e9a6637d2e4f010368a53716
+MISC ChangeLog 1331 SHA256 2ad1bf8a7f3d7bb7e5618f9328cde3303ccbe76eba366554cc87578997e1f8f8 SHA512 9e932267e8126e281c7be1f405357dcbb6f2da5b43ee4d5afb5d2c939530bbae059f6a2f3be3bee89f71eae55a4d7f9747180768eaee04d78130f071d8fa8374 WHIRLPOOL 4e7e8fe12e33037d6812c5325efb8d8af8a84d6d0e2ccd639cf29da2e9b3adddcd0b9848ea62631348d9a12101c1af77602cb8f4bc0bbcb2feb4f78d32791442
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/dev-db/barman/barman-1.0.0.ebuild b/dev-db/barman/barman-1.0.0.ebuild
deleted file mode 100644
index 6a0f4cc9a865..000000000000
--- a/dev-db/barman/barman-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.0.0.ebuild,v 1.1 2012/08/27 15:10:25 patrick Exp $
-EAPI=4
-
-inherit distutils
-
-DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
-
-HOMEPAGE="http://www.pgbarman.org"
-SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="dev-python/argh
-	>=dev-python/psycopg-2
-	dev-python/python-dateutil
-	net-misc/rsync
-	dev-db/postgresql-server"
-DEPEND=""
diff --git a/dev-db/barman/barman-1.1.0.ebuild b/dev-db/barman/barman-1.1.0.ebuild
deleted file mode 100644
index 91589c3180b0..000000000000
--- a/dev-db/barman/barman-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.1.0.ebuild,v 1.1 2012/10/17 09:33:10 patrick Exp $
-EAPI=4
-
-inherit distutils
-
-DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
-
-HOMEPAGE="http://www.pgbarman.org"
-SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="dev-python/argh
-	>=dev-python/psycopg-2
-	dev-python/python-dateutil
-	net-misc/rsync
-	dev-db/postgresql-server"
-DEPEND=""
diff --git a/dev-db/barman/barman-1.1.1.ebuild b/dev-db/barman/barman-1.1.1.ebuild
deleted file mode 100644
index 982d5cff630b..000000000000
--- a/dev-db/barman/barman-1.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.1.1.ebuild,v 1.1 2012/10/29 05:27:23 patrick Exp $
-EAPI=4
-
-inherit distutils
-
-DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
-
-HOMEPAGE="http://www.pgbarman.org"
-SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="dev-python/argh
-	>=dev-python/psycopg-2
-	dev-python/python-dateutil
-	net-misc/rsync
-	dev-db/postgresql-server"
-DEPEND=""
diff --git a/dev-db/barman/barman-1.1.2.ebuild b/dev-db/barman/barman-1.1.2.ebuild
deleted file mode 100644
index 9ab43acde832..000000000000
--- a/dev-db/barman/barman-1.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.1.2.ebuild,v 1.1 2012/12/18 12:27:08 patrick Exp $
-EAPI=4
-
-inherit distutils
-
-DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
-
-HOMEPAGE="http://www.pgbarman.org"
-SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="dev-python/argh
-	>=dev-python/psycopg-2
-	dev-python/python-dateutil
-	net-misc/rsync
-	dev-db/postgresql-server"
-DEPEND=""
diff --git a/dev-db/barman/barman-1.2.0-r1.ebuild b/dev-db/barman/barman-1.2.0-r1.ebuild
deleted file mode 100644
index 253f4c7a617d..000000000000
--- a/dev-db/barman/barman-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.2.0-r1.ebuild,v 1.1 2013/05/24 08:41:44 patrick Exp $
-EAPI=4
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6:2.7"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
-
-HOMEPAGE="http://www.pgbarman.org"
-SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="dev-python/argh
-	>=dev-python/psycopg-2
-	dev-python/python-dateutil
-	net-misc/rsync
-	dev-db/postgresql-server"
-DEPEND=""
-
-pkg_setup() {
-        python_set_active_version 2
-        python_pkg_setup
-}
diff --git a/dev-db/barman/barman-1.2.0.ebuild b/dev-db/barman/barman-1.2.1.ebuild
index 9b101927d40d..47ee17c89b2d 100644
--- a/dev-db/barman/barman-1.2.0.ebuild
+++ b/dev-db/barman/barman-1.2.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.2.0.ebuild,v 1.2 2013/05/24 08:35:19 patrick Exp $
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.2.1.ebuild,v 1.1 2013/06/20 03:35:23 patrick Exp $
+EAPI=5
 
-inherit distutils
+PYTHON_COMPAT=( python{2_6,2_7})
+
+inherit distutils-r1
 
 DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
 
@@ -15,15 +17,9 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-RDEPEND="dev-python/argh
-	>=dev-python/psycopg-2
-	dev-python/python-dateutil
+RDEPEND="dev-python/argh[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	net-misc/rsync
 	dev-db/postgresql-server"
 DEPEND=""
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-