Restore ~alpha keyword; Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 14 insertions, 111 deletions

diff --git a/dev-libs/lockdev/ChangeLog b/dev-libs/lockdev/ChangeLog
index c9a8df4a91ea..e0d8863c620d 100644
--- a/dev-libs/lockdev/ChangeLog
+++ b/dev-libs/lockdev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/lockdev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/ChangeLog,v 1.21 2014/07/15 15:56:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/ChangeLog,v 1.22 2014/07/15 21:11:53 zlogene Exp $
+
+  15 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> -lockdev-1.0.3.1.2-r1.ebuild,
+  lockdev-1.0.3.1.2-r3.ebuild:
+  Restore ~alpha keyword; Drop old.
 
   15 Jul 2014; Pacho Ramos <pacho@gentoo.org> lockdev-1.0.3.1.2-r3.ebuild:
   amd64/x86 stable, bug #516186
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index 5e68ce8a26a1..a7bdbab4dd93 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -5,15 +5,16 @@ AUX lockdev-1.0.3-add-autotools.patch 1344 SHA256 d6210c782386cee75d5c8945eb34e2
 AUX lockdev-1.0.3-fix-perl.patch 307 SHA256 75de8258be62a07dd77cbbc2eff04f4e352ba68fb1d1f6da4fe91ae718440115 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a WHIRLPOOL e3652b8a00e4cffa028226423cb333f0803d2acff9ac61a63c48e0292d4d452d752a7f6ac9bac99b5b6c65101c1226b178aed781b824523d49ee4e0b3c5da0ab
 DIST lockdev_1.0.3-1.2.diff.gz 7642 SHA256 02d35e82805551342438804b3bfe9df153f9089407272f1cda9d76d84740ce90 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c WHIRLPOOL 3452a175b3df9bcd56eee292231fd67e65519adf3bdc32e720976489a0ff9355ce9abe796059de139b07cb9df1508269876fda9295591a45331e725d14488049
 DIST lockdev_1.0.3.orig.tar.gz 29150 SHA256 ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82 SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b WHIRLPOOL 79002de33c1c0748e1d555c144ca72ae1737616cbb72f491d6bef3a9226798b0eb23d875885e6fd78c9e0eff03c965b4992008f5238aa564d0ad09747b9ac8d7
-EBUILD lockdev-1.0.3.1.2-r1.ebuild 2178 SHA256 0328ee63adff845c0666a6c2b0cb8c39dbc4b6e4ec17d8a16ea49bc44a72ca40 SHA512 60fc452c4e2a728b3b88fccbc8e8adc08d84a5660e9bb451d9774fd4376eb5ac8da44fba6e95613d4fec3496776b0a13759b848683331fbda6ad0029aed62262 WHIRLPOOL d7a31d45fd6667c143f62688d04a5fb21dd551a25ac5264fe676332736f9c6de59ada5c94097f2c4acfa9f5a2ffa1c6730e1daa064f3c751ffefe4687789450d
 EBUILD lockdev-1.0.3.1.2-r2.ebuild 2002 SHA256 69c4e3de1e108a57209292f9b77e92c8dcc08fe842ca00c9b39666ed88495cc5 SHA512 aa300d91ca01366a210459135849de90d995c1550005d02ef4ee90f8dfbf4cc584f91cac3ce27649e9edee72444c58e452a8f042d0f8662a0c8ce403b9e1c9fd WHIRLPOOL ec7fa65d4d2bf13b8d8d7a61de7fcf41729cead8992ef49761d455b1b05b4d184b04b428db067106ed475767eca2109367b5d0de6b9da99822960ce3cac9caf6
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 2196 SHA256 4a6b2355106ee9dfd1cbf78328bc81d5f2a1a4b8b3484f7fe5c5373eccd5d5d1 SHA512 d95b2441f2c8755e37a70650f5ac4958aae618e744163a737317a612f6776eb327adce14bd34baa731a180a08f4cdb7ef2e4914f9629037e318aa1eb09544037 WHIRLPOOL e5b2af45c1892ca83de1f980e617e43580d0f1bcbfc1860074bef92870d05797f2c592c84dde059bb8b2bdd3cace752136debbc338518af404f44b6a1b1e4509
-MISC ChangeLog 2980 SHA256 70e5db6c6f287d2903b395eb3f001f927b556de09e2c8d3e6f71b2fd54598cdc SHA512 cd59eab9c3e7d96a8b8e47dd5ff51ee59c78708c3aff0a9fad5763a0962499380934d20e0b84075b8ae8fe6569efd680f5c4d879a58ca420f8671d35175d35e0 WHIRLPOOL beff79087c32a0cad36b4f9bd3b81f13fed8dd66953ef8f837e7e9d3d999a9b0c648ef031c3120aff0c0160095c14f1730116ef0fd9d44ac19cdcd426ea79439
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 2205 SHA256 439049209b666f67b753ebfc11fc70bc4c2a5cccabd5922f5cf31bfa818ffd10 SHA512 d3b534c9ef5c1e06dbf8737522c2402b4d1d29f93123e38fca6504f70d519a85762f3053d7461a1084fbe7c852b2102720d0a9ebf29bc32f76f482f7c153042f WHIRLPOOL 6ef154b620d79ccaccfc1a1f5b88b0aaa610dd8c0dface2906b74c193afe4d300bf862f328ce375fd73283d9799ddb94c851a3dc12cb3b15f114745af0f379ba
+MISC ChangeLog 3130 SHA256 a33abe5cde762d2e91b71aecad5cb94bf81bbd3b186f7a65553c9804b6509d48 SHA512 fa294b544e4be9a35e8807cde5e5e16d27ce3c9603d5f9014242ef3682152c4430f0329df73b8273287776694d4de70d5f17db3d5eec45afa6aa9a6bf34e2a36 WHIRLPOOL 0ae6372773bc1f26f4d8b3d2c381b4de9425f348af1a268cbd616544674f682dd33fb4db4e6446226a959c71e619b086ee2d0821d0e9fb11e78b50ee254424d0
 MISC metadata.xml 233 SHA256 72454b24325b38bc1bb47c4aad0f3217d9caced2e5eb6fad3b4b2dfdd4f5ab26 SHA512 d3e1cfb6649160cd4f932f0c859b6df1311f3c044c66aa4c0d0806b8b7a73d2d8530b6b33f6f407c35bd8b39e3612a1f1794984474d1db7c8985300a9655985b WHIRLPOOL 68dcadd5aa95a4a58201efd70ca28bcf6e6716e2c8966ef1395787a73daad71808deb122f1390d2245bb7a924f074809e0740d5da6233b6b63a20ff99f9b52be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPFTyAACgkQCaWpQKGI+9ShvACffTi97QdeJdUsRvkMhWmA7/0C
-EQIAn3IEsB+m7CU/8qZV10Wyf4TXO0hA
-=cigi
+iJwEAQEIAAYFAlPFmlYACgkQG9wOWsQutdYFKAP9HAPtE/ruQabl6OmgtIKLsMf8
+1rcFp80CIIk+jXOkKVOh1qBL5zcm1L/qQL/A8z++lsTwijuSjQCnWzuL26HFtSfw
+47NT23xWIjfFLf7JqXLJzlyW7+MLmEdLUpfQOqBfKTL1Rm5luJnSBL1LmObdr4vQ
+PTP3DGWORV0ymV+jMQg=
+=/8En
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild
deleted file mode 100644
index 712b6a4019ec..000000000000
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild,v 1.7 2014/07/04 12:41:39 klausman Exp $
-
-EAPI="2"
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit toolchain-funcs base perl-module eutils versionator autotools
-
-MAJOR=$(get_major_version)
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DEB_PV=$(replace_version_separator 3 '-')
-DEB_P=${PN}_${DEB_PV}
-
-DESCRIPTION="Library for locking devices"
-HOMEPAGE="http://packages.debian.org/source/sid/lockdev"
-SRC_URI="
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.diff.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 x86"
-IUSE="perl"
-
-DEPEND="
-	perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_P}-add-autotools.patch"
-	"${FILESDIR}/${MY_P}-fix-perl.patch"
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-PERL_S=${S}/LockDev
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# Note: we do *not* want to be in ${S} for this, as that breaks the patch
-	epatch "${WORKDIR}/${DEB_P}.diff"
-
-	cd "${S}"
-	base_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	econf
-
-	if use perl; then
-		cd "${PERL_S}"
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use perl; then
-		cd "${PERL_S}"
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd "${PERL_S}"
-		SRC_TEST="do"
-		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${S}/.libs"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* debian/NEWS README.debug || die "dodoc failed"
-	newdoc debian/changelog changelog.debian || die "newdoc changelog.debian failed"
-
-	if use perl; then
-		cd "${PERL_S}"
-		mytargets="pure_install"
-		docinto perl
-		perl-module_src_install
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
index cfc5a81bf40e..3046dbc2a343 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild,v 1.6 2014/07/15 15:56:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild,v 1.7 2014/07/15 21:11:53 zlogene Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 x86"
 IUSE="perl"
 
 DEPEND=""