* Added new version 0.132.6

* Migrated to EAPI=4
* Added new comaintainer

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 91 insertions, 40 deletions

diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index 9387a15e1c50..8fc423723ae8 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/osc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.2 2011/08/15 09:02:09 miska Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.3 2012/03/07 12:56:19 miska Exp $
+
+*osc-0.132.6 (07 Mar 2012)
+
+  07 Mar 2012; Michal Hrusecky <miska@gentoo.org> +osc-0.132.6.ebuild,
+  metadata.xml, osc-0.130.1.ebuild, osc-9999.ebuild:
+  * Added new version 0.132.6 * Migrated to EAPI=4 * Added new comaintainer
 
   08 Jul 2011; Michal Hrusecky <miska@gentoo.org> osc-0.130.1.ebuild,
   osc-9999.ebuild:
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 3da21abc20eb..3f3ce45c0163 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -5,6 +5,10 @@
 <email>miska@gentoo.org</email>
 <name>Michal Hrušecký</name>
 </maintainer>
+<maintainer>
+<email>tampakrap@gentoo.org</email>
+<name>Theo Chatzimichos</name>
+</maintainer>
 <longdescription lang="en">
 Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
 </longdescription>
diff --git a/dev-util/osc/osc-0.130.1.ebuild b/dev-util/osc/osc-0.130.1.ebuild
index a1018d301ad6..af1a7c49679b 100644
--- a/dev-util/osc/osc-0.130.1.ebuild
+++ b/dev-util/osc/osc-0.130.1.ebuild
@@ -1,19 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.130.1.ebuild,v 1.2 2011/08/15 09:02:09 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.130.1.ebuild,v 1.3 2012/03/07 12:56:19 miska Exp $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPO_URI="git://gitorious.org/opensuse/osc.git"
+OPENSUSE_RELEASE="11.4"
+OBS_PACKAGE="${PN}"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	EXTRA_ECLASS="obs-download"
+fi
 
-[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="git-2"
 inherit distutils ${EXTRA_ECLASS}
 unset EXTRA_ECLASS
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
 
-[[ "${PV}" == "9999" ]] || SRC_URI="https://api.opensuse.org/public/source/openSUSE:11.4/${PN}/${P}.tar.gz"
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,23 +32,14 @@ DEPEND="dev-python/urlgrabber
 	dev-python/elementtree
 	app-arch/rpm[python]
 	dev-python/m2crypto"
-RDEPEND="${DEPEND}
-	dev-util/suse-build"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	distutils_src_install
-	dosym osc-wrapper.py /usr/bin/osc || \
-		die "Creating /usr/bin/osc failed"
-	keepdir /usr/lib/osc/source_validators    || \
-		die "Creating /usr/lib/osc/source_validators failed"
+	dosym osc-wrapper.py /usr/bin/osc
+	keepdir /usr/lib/osc/source_validators
 	cd "${ED}"/usr/
-	find . -exec grep -l /usr/bin/build \{\} \; | while read i; do
-		sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'   "${i}" \
-			|| die "sed for /usr/${i} failed"
-	done
-	find . -exec grep -l /usr/lib/build \{\} \; | while read i; do
-		sed -i 's|/usr/lib/build|/usr/share/suse-build|g' "${i}" \
-			|| die "sed for /usr/${i} failed"
-	done
+	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'   {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/share/suse-build|g' {} +
 	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
 }
diff --git a/dev-util/osc/osc-0.132.6.ebuild b/dev-util/osc/osc-0.132.6.ebuild
new file mode 100644
index 000000000000..d045601bf481
--- /dev/null
+++ b/dev-util/osc/osc-0.132.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.132.6.ebuild,v 1.1 2012/03/07 12:56:19 miska Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://gitorious.org/opensuse/osc.git"
+OPENSUSE_RELEASE="12.1"
+OBS_PACKAGE="${PN}"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit distutils ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Command line tool for Open Build Service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+[[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/urlgrabber
+	dev-python/pyxml
+	dev-python/elementtree
+	app-arch/rpm[python]
+	dev-python/m2crypto"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils_src_install
+	dosym osc-wrapper.py /usr/bin/osc
+	keepdir /usr/lib/osc/source_validators
+	cd "${ED}"/usr/
+	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'   {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/share/suse-build|g' {} +
+	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
+}
diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index aae960d074df..e1e5d60c73ca 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -1,19 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.2 2011/08/15 09:02:09 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.3 2012/03/07 12:56:19 miska Exp $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPO_URI="git://gitorious.org/opensuse/osc.git"
+OPENSUSE_RELEASE="12.1"
+OBS_PACKAGE="${PN}"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	EXTRA_ECLASS="obs-download"
+fi
 
-[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="git-2"
 inherit distutils ${EXTRA_ECLASS}
 unset EXTRA_ECLASS
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
 
-[[ "${PV}" == "9999" ]] || SRC_URI="https://api.opensuse.org/public/source/openSUSE:11.4/${PN}/${P}.tar.gz"
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,23 +32,14 @@ DEPEND="dev-python/urlgrabber
 	dev-python/elementtree
 	app-arch/rpm[python]
 	dev-python/m2crypto"
-RDEPEND="${DEPEND}
-	dev-util/suse-build"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	distutils_src_install
-	dosym osc-wrapper.py /usr/bin/osc || \
-		die "Creating /usr/bin/osc failed"
-	keepdir /usr/lib/osc/source_validators    || \
-		die "Creating /usr/lib/osc/source_validators failed"
+	dosym osc-wrapper.py /usr/bin/osc
+	keepdir /usr/lib/osc/source_validators
 	cd "${ED}"/usr/
-	find . -exec grep -l /usr/bin/build \{\} \; | while read i; do
-		sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'   "${i}" \
-			|| die "sed for /usr/${i} failed"
-	done
-	find . -exec grep -l /usr/lib/build \{\} \; | while read i; do
-		sed -i 's|/usr/lib/build|/usr/share/suse-build|g' "${i}" \
-			|| die "sed for /usr/${i} failed"
-	done
+	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'   {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/share/suse-build|g' {} +
 	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
 }