Stabilise latest on amd64 and x86 to ensure build is correct and matching what obs is doing.

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

3 files changed, 8 insertions, 63 deletions

diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index b332eb603d9b..1024c989c880 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.18 2013/11/02 09:03:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.19 2013/11/02 09:05:08 scarabeus Exp $
+
+  02 Nov 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  -suse-build-2013.05.17-r1.ebuild, suse-build-2013.10.15.ebuild:
+  Stabilise latest on amd64 and x86 to ensure build is correct and matching what
+  obs is doing.
 
 *suse-build-2013.10.15 (02 Nov 2013)
 
diff --git a/dev-util/suse-build/suse-build-2013.05.17-r1.ebuild b/dev-util/suse-build/suse-build-2013.05.17-r1.ebuild
deleted file mode 100644
index 512a102c5499..000000000000
--- a/dev-util/suse-build/suse-build-2013.05.17-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 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.05.17-r1.ebuild,v 1.1 2013/07/16 13:52:35 scarabeus 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?package=build&project=openSUSE%3ATools"
-
-[[ "${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.1.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
index c5e4af17bc43..90fd2c33b21e 100644
--- a/dev-util/suse-build/suse-build-2013.10.15.ebuild
+++ b/dev-util/suse-build/suse-build-2013.10.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1 2013/11/02 09:03:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.10.15.ebuild,v 1.2 2013/11/02 09:05:08 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