Version bump to latest. Cleanup older. Polish the ebuild a bit.

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

4 files changed, 30 insertions, 74 deletions

diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index cfe2dde4e8a7..58c530dff521 100644
--- a/dev-util/suse-build/ChangeLog
+++ b/dev-util/suse-build/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/suse-build
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.5 2012/07/30 13:48:45 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.6 2012/10/02 11:17:27 scarabeus Exp $
+
+*suse-build-2012.09.27 (02 Oct 2012)
+
+  02 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +suse-build-2012.09.27.ebuild, -suse-build-2011.01.20-r1.ebuild,
+  -suse-build-2011.09.26-r1.ebuild, suse-build-9999.ebuild:
+  Version bump to latest. Cleanup older. Polish the ebuild a bit.
 
 *suse-build-2011.09.26-r1 (30 Jul 2012)
 *suse-build-2011.01.20-r1 (30 Jul 2012)
@@ -32,4 +39,3 @@
   +suse-build-2011.01.20.ebuild, +suse-build-9999.ebuild, +metadata.xml:
   New ebuild for suse-build. Ebuild written by me. Dependency for osc - bug
   #350599
-
diff --git a/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild b/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild
deleted file mode 100644
index 8d4fe4aff171..000000000000
--- a/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild,v 1.1 2012/07/30 13:48:45 miska Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://gitorious.org/opensuse/build.git"
-OPENSUSE_RELEASE="12.1"
-MY_PN="build"
-OBS_PACKAGE="${MY_PN}"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	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}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-[[ "${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/rpm"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" pkglibdir=/usr/share/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-	done
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/share/suse-build|' {} +
-}
diff --git a/dev-util/suse-build/suse-build-2011.01.20-r1.ebuild b/dev-util/suse-build/suse-build-2012.09.27.ebuild
index 118021237b91..51c96926fd87 100644
--- a/dev-util/suse-build/suse-build-2011.01.20-r1.ebuild
+++ b/dev-util/suse-build/suse-build-2012.09.27.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2011.01.20-r1.ebuild,v 1.1 2012/07/30 13:48:45 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2012.09.27.ebuild,v 1.1 2012/10/02 11:17:27 scarabeus Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://gitorious.org/opensuse/build.git"
-OPENSUSE_RELEASE="11.4"
-MY_PN="build"
-OBS_PACKAGE="${MY_PN}"
+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
 
@@ -21,26 +20,28 @@ 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}/${MY_PN}-${PV}.tar.gz"
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 [[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
 
-RDEPEND="virtual/perl-Digest-MD5
+RDEPEND="
+	virtual/perl-Digest-MD5
 	virtual/perl-Getopt-Long
 	dev-perl/XML-Parser
 	dev-perl/TimeDate
 	app-shells/bash
-	app-arch/rpm"
+	app-arch/rpm
+"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
 
 src_compile() { :; }
 
 src_install() {
-	emake DESTDIR="${D}" pkglibdir=/usr/share/suse-build install
+	emake DESTDIR="${ED}" pkglibdir=/usr/share/suse-build install
 	cd "${ED}"/usr
 	find bin -type l | while read i; do
 		mv "${i}" "${i/bin\//bin/suse-}"
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
index eec17a7c5fc7..eb90dbf0fddf 100644
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.4 2012/07/30 13:48:45 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.5 2012/10/02 11:17:27 scarabeus Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://gitorious.org/opensuse/build.git"
-OPENSUSE_RELEASE="12.1"
-MY_PN="build"
-OBS_PACKAGE="${MY_PN}"
+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
 
@@ -21,26 +20,28 @@ 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}/${MY_PN}-${PV}.tar.gz"
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 [[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
 
-RDEPEND="virtual/perl-Digest-MD5
+RDEPEND="
+	virtual/perl-Digest-MD5
 	virtual/perl-Getopt-Long
 	dev-perl/XML-Parser
 	dev-perl/TimeDate
 	app-shells/bash
-	app-arch/rpm"
+	app-arch/rpm
+"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
 
 src_compile() { :; }
 
 src_install() {
-	emake DESTDIR="${D}" pkglibdir=/usr/share/suse-build install
+	emake DESTDIR="${ED}" pkglibdir=/usr/share/suse-build install
 	cd "${ED}"/usr
 	find bin -type l | while read i; do
 		mv "${i}" "${i/bin\//bin/suse-}"