Stabilise on amd64 and x86. Drop older.

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

5 files changed, 23 insertions, 134 deletions

diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index 8b03719fa911..39a3cdb14de6 100644
--- a/dev-util/suse-build/ChangeLog
+++ b/dev-util/suse-build/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/suse-build
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.21 2014/02/02 15:11:16 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.22 2014/02/25 12:49:00 scarabeus Exp $
+
+  25 Feb 2014; Tomáš Chvátal <scarabeus@gentoo.org>
+  -suse-build-2013.10.15-r1.ebuild, -suse-build-2013.10.15.ebuild,
+  suse-build-2013.12.05.ebuild:
+  Stabilise on amd64 and x86. Drop older.
 
 *suse-build-2013.12.05 (02 Feb 2014)
 
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
index 52050c863e49..b40bc480f587 100644
--- a/dev-util/suse-build/Manifest
+++ b/dev-util/suse-build/Manifest
@@ -2,18 +2,25 @@
 Hash: SHA256
 
 AUX suse-build-20131015-libexec-paths.patch 9154 SHA256 cf99f71144e0dc1f9d9069acb6d648f284c22fb66d731ffd7614509ec2830ec1 SHA512 754809455b59bb2427a1129d311210809acc0132a76b8749806f85b0c0a329e477bf8891878d3be983f24e545f76f7569475bf80a729680e4566b57bf1ee0e86 WHIRLPOOL d9e41702106c15faf11cc58831229127038e224fd112eeab3d4f409898cadb10f5bcb9996bd3684f9c34bcf485fe9c8c605d8f3fb35a2026bb246bb975088ced
-DIST obs-build-20131015.tar.gz 155183 SHA256 ffa0506a8b7f55fa3136ddbf45ac963ab7e56140cb3b33bc50ebf91ec497e5f2 SHA512 bd5fd71c4c7e5b8904b8bda6b3246c74a8ccf1bc6c44c365f09974f3dc4a90b2306549f19a5d0748968a0bdcea0e15a5c9f577476ccb5120b531a543f72241b0 WHIRLPOOL 0d9641a7287a8aae4bc23ad0a15394d93ee95e642e56bf3c5ac19b69efadca127f241e6a2f91db6f5ce8706b4446a249a675bd65b0c2c175b5ef8cef680f9d1e
 DIST obs-build-20131205.tar.gz 155926 SHA256 38e208837a16c86862c04ff547de910e9cf30ffe0622c10d041b523a37671b48 SHA512 96e993ef619baadff744b62be520b384b7ab8ef1d6f56c269b77244c0f9eed5cbbb431ff52c42302024a46a2774bacdc720feb899c116cb6301de0887caa37c0 WHIRLPOOL 3945093a9be62a6a468d45069603a9508b42a85d0b632777ea3fd707540cbf339be31af679879cac0d3e9f0671b8b3c26cfbeb491a788df7efbdf9c0989c33b5
-EBUILD suse-build-2013.10.15-r1.ebuild 1597 SHA256 c40239cf065ee37b3915748f0ecb2b0552c8fd512e21b05b45a2cef0b2d5927f SHA512 7002f7d6dad99476a14027ada9b31744fb2795f213551ec83eab1ec8efb79f7f2fd51e8da850b3cc269b1acdd71d4891c439a7a87f433a22ce3a31354be7ecbe WHIRLPOOL 5abe612b31f4b78863b35eaf1b1a57d459c97ec6ff6292ea1c49550c6f57d21cd001a153b57a39fe43cf48293def94805dd934bedef9a4f9931f0d57d8046b85
-EBUILD suse-build-2013.10.15.ebuild 1589 SHA256 50641863a2e4621058e6c227053b0298956050baf76cd47cdd0bb555d4b59955 SHA512 0e661af7140a40eb47f13f51f7b5d25aef7b62e613221fc9e66d76de71ae0823cb85113da3e3e122d7edab658d6457f9bc6e2001870b445deb4df6c9733b7458 WHIRLPOOL 0c5a1b20a05184ced6747461be74cffe528d7e04188b8fa44c80dbe12163c3b3531e9fbff3873e8cd5d7e2d5016e51d205b97d80b664cee000ab24aab389fd7d
-EBUILD suse-build-2013.12.05.ebuild 1594 SHA256 94d97372399892bb3c03b5a9a1a3dd78c91485d2f7d3580b00db335a7808eea0 SHA512 5b4bde62303c552f985316723057dacb65097ecc552e4fbfd9e1ef6b413a604a5bda7ae879bb67d679b61c2b58972bd071739b32134aa0bbb1138599f9dd6725 WHIRLPOOL b23ed09795b7339d355d5a8dc50c62466d4ac0161917e9a2b50f719feb4d8d641f11230080e0be1110f07bea4cff113898aee9f03e8aa7f04f388a6b157a674d
+EBUILD suse-build-2013.12.05.ebuild 1596 SHA256 dfc6887b515c8ad291ec7d328f1c15949eb65b4fe269e8adb55de2781f45a04f SHA512 8ea19a9a22213e5afd0bd51486084dc72ddcfce49e2d720ff2e3f02be3f5b4e39482705fadcf63642bc1b50b72d75e4f29422da09b3ab28782e7189f41f3358d WHIRLPOOL d14f03db542e0610af0827200f1a98609ed9d74a461d77e38d70e0adab39535af02e0c5e0d612d956ee9a0646c36c470cc45b589336f66800ea33de4a0a28b37
 EBUILD suse-build-9999.ebuild 1584 SHA256 4944b2efb155449fcc23ab8746a1e464653b914b1ba43cdd7cbcffac4582d877 SHA512 b7fe4db0f494011d6963f609a98443c248ecb8a16d169004ab393978644c612f6fa604c30c47f4f775ae5f87d3a9236ecb6bf8b178429b57571b77d62f7c1bad WHIRLPOOL 5d12d82c0bb31f594690d6916402f623ff4dc4ee61861a98cab94623c41d1bc474ff00d29622df136ea26c57ae2fac18a2b8ce1e5630e23557ebf81fd16bc657
-MISC ChangeLog 4511 SHA256 bdccc504f7187fe258b71dc193d051f02d79f2bc4af104acb56351587aa06b53 SHA512 aec9172dd87a4938295327873b929f390bb1bf0e01cbc3fbb63f24c0a7f77f6290e966cad9841da3295aa47bc76057db3f3105b57f8f43e367344b386bd456a3 WHIRLPOOL 1aadf185929c877bb15a0b373c1178e3aea645a9574c046b5b3c1b8cd78ec13337b96cda9a01b48cd02300e1386000b0a64f6c64a5d5dfc123ce421d9038bd50
+MISC ChangeLog 4712 SHA256 1ea023052d3aea3fcc3d5b9e839fa5967ee059a15758c5f76fa94ba594bb3464 SHA512 eb7fc35ade77c11ba8ea6325a43aa1ac79abc39160d12578e882b9460a2659babfac6d635cb982b67b45f79c22dcce13a55b3f8ad0b9f5fe0f3d59ef752569af WHIRLPOOL 786600ee0ebe358e4a842b925e35d36c15a5ede21b77bf9380e3175fd67d0a9bfe232e1e42d2679166b137ceb385318c9e5796aca31e140ace2a0ef2f67b0e4d
 MISC metadata.xml 409 SHA256 cc5c5706ac5406afec663da06a93e4c91f96c2ad3dce51e7a6769d8da9031205 SHA512 e27aada2ced11515a108f0203cad9a6cede66c3d33ea91846113a118933107024fabefb5cdfdb8d6159058d4fd3e962d29a205fc637df976a156582e48e60e7b WHIRLPOOL c62713b4d1e52190ba07d06e604b672244efbbe76d95b29565487035a4e77956b348daa59355011c80bfae0860435844285a60c76b9714c5c4fdeb77f6f1f4b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLuYBUACgkQpFCI79Oct8U+DwD+PiQejIXMYX6pnXFv9hNnpNZ/
-4MMWwuTaRD830KTkv7IBAKLtNd3u0ys82IBKqV8ELWGCu44/VSfg/37uFLO/SbXX
-=EOuO
+iQIcBAEBCAAGBQJTDJEzAAoJEOSiRoyO7jvob+4P/jrXqJpYhUCg4ugCZLMBoT0k
+lNUlcCX1FEC83yNFhGz7xxOZ4KiQ+narHVXPktNofUFO6eUgVpVL95jOMUzJo8Ht
+voq1Z+1KZiA7jgIpKESPPBBUiGBAPXMsoFu6LLpbjsWpzWGxNT+6tkRt0BKtHVPv
+GFzqv+9QbL2ryKv2ifil++Qjn4D6MN78zcxEqUgLLAF9+0fTCldrp847ZkaUP5JB
+b5jrWUM1VWEEcAqHG+Zyc1juajOCoO4iTQtFAZFJ4I277KN6djp2fOSztdygtu3c
+61ZjB0XjN11MBNFdKHdqY6GHNR3j/eEWaNbOI/QXo8OPilZO1sqbMznFVuFSkVII
+Q8ldwJR4Tbaohf3qKGP8KMHu0lUArPiXvnDbRpgVwCQbbr/gwrJyrlAgAi4baYtb
+B/fHpSEMfeJSVpvRiIci5XOh5yAMgLxHwpVAwetxTLz9iDFL+rf71acSCfukYKse
+Ou53WwwHp0GM0xd+BYv9aJqTfX/GpxBNKIZCjq140iZozo4ckbpidw+HGrPZDmUM
+zUddTNIYc5hZidovcgbAfBzueFPyFtENKkD8UXgHtptIGfoSjRHp38V4QGCFh2jd
+Bjr6trbLicMCuEwhYJ756/IpQu6mHnAUnJYUDUHmHf3jXg4IJ+HouRBXUlvna81J
+p65S5v6wcwNsSPVJuVVN
+=/C6X
 -----END PGP SIGNATURE-----
diff --git a/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild b/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild
deleted file mode 100644
index 8b748d0b8a89..000000000000
--- a/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild,v 1.1 2014/01/28 13:35:22 miska Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://github.com/openSUSE/obs-build.git"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PACKAGE="build"
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="symlink"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/cpio
-	app-arch/rpm
-"
-
-S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
-
-src_prepare() {
-	epatch "${FILESDIR}/suse-build-20131015-libexec-paths.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
-	done
-
-	# create symlink for default build config
-	dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
-}
diff --git a/dev-util/suse-build/suse-build-2013.10.15.ebuild b/dev-util/suse-build/suse-build-2013.10.15.ebuild
deleted file mode 100644
index 50b0dfe938aa..000000000000
--- a/dev-util/suse-build/suse-build-2013.10.15.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.10.15.ebuild,v 1.3 2014/01/28 13:35:22 miska Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://github.com/openSUSE/obs-build.git"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PACKAGE="build"
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="symlink"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/cpio
-	app-arch/rpm
-"
-
-S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
-	done
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
-
-	# create symlink for default build config
-	dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
-}
diff --git a/dev-util/suse-build/suse-build-2013.12.05.ebuild b/dev-util/suse-build/suse-build-2013.12.05.ebuild
index bc07d523ce11..4daabfbb6fbc 100644
--- a/dev-util/suse-build/suse-build-2013.12.05.ebuild
+++ b/dev-util/suse-build/suse-build-2013.12.05.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-util/suse-build/suse-build-2013.12.05.ebuild,v 1.1 2014/02/02 15:11:16 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.12.05.ebuild,v 1.2 2014/02/25 12:49:00 scarabeus Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="symlink"
 [[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	virtual/perl-Digest-MD5