Fixing paths (bug#446074) and version update

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xD39CB7C5

4 files changed, 83 insertions, 22 deletions

diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index b0529b6704da..347b8a103650 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/osc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.12 2012/12/17 10:00:35 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.13 2013/03/18 10:26:27 miska Exp $
+
+*osc-0.139.1 (18 Mar 2013)
+
+  18 Mar 2013; Michal Hrusecky <miska@gentoo.org> +osc-0.139.1.ebuild,
+  osc-9999.ebuild:
+  Fixing paths (bug#446074) and version update
 
   17 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> -osc-0.136.0.ebuild,
   osc-0.137.0.ebuild:
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 184aa47e33ec..6824d0509603 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -2,24 +2,16 @@
 Hash: SHA256
 
 DIST osc-0.137.0.tar.gz 323345 SHA256 193509643e594fa9b97bfeeab93589b450dde7be35945fe37e545b64cb9a5ac0 SHA512 8b2401a8f7e6c5721f7e31f53976585df742f3a37277a91d90db865d9df9de80e4a8221883b5074985b0106ef0ced470cb6c23d4dc011ca1beda00052050b42a WHIRLPOOL 1153cbdd81d810cc3194967b79b5cbf37aa50df10892ce057514b1c9db6ef27f27f4540a57009a9deded470416f05bfc1d4ce6deb8eb413b9745672e84ef6b37
+DIST osc-0.139.1.tar.gz 338316 SHA256 a1f0cb6fe18957ed4edb84ca5adc10a2908828c37de31bcfaa1c747755836fed SHA512 ea3d29d2b9017b9b667da41fe28d5c0950e4720849bab057cad4027c0bb879f833fa3d5d2ba54c477cd6ad5cd164937b44c3e8ccb68c8c0858113f77963c064f WHIRLPOOL 02e98cb9d77b21a9c62e915b3831d149a6c78bd3a519b0038ba7f5f8aa2bd13992985d7c1caf28e1d4a5b8524e6d009ea0f27463bb7f94a96d5da18243888f38
 EBUILD osc-0.137.0.ebuild 1376 SHA256 7d673e8b4f91def967ecefe55d2a64559b1f6b27c2a3d3389b5c6f137952935e SHA512 9d9fa13cc12d6f206632ffca760491551b90ed76d2d986916f7d66ee8eb86b7033941a8f4e13b7ded1de7d7c77ebd63bd48fe1805124efbd4773c0505cb1f636 WHIRLPOOL fb18a4c6851638406189a8a25e1090298d3027e96fda1ea03c6e49b690a99cc1cf565703152fe39d026e45c96f31b33f53a38fd1a215bacc8a38c80842c2fa2f
-EBUILD osc-9999.ebuild 1297 SHA256 80b018bcadbb583a843d3e1981fb51260d45cea2f4d95e8e3619db153731bd1d SHA512 007c983d9a2bf0196312a493a324652db7913e9f35de9cb0ce4d8856936e57f2a58feaad9534aff0bf556955c356bcc97ce9ab24cd03b17c1bf402fdc10af989 WHIRLPOOL a830e3adecb8268d8ebf0b65c4a58195d61fed8e01705e5dc7ec95ce6766aafb9da1ed43096c9bbdad28da7721f54b6ddba69fc34e3526e8b88b572c69b4d672
-MISC ChangeLog 2012 SHA256 b0bb58183ad92c4b0e8481097b82d935366a84d0129f5477686cff7b9b65525c SHA512 b1729e7ecf7fadf846ef95163119339d70308a3068fbfb1e2a6aab06d53cff1406e3006934c7b03c4f32f9580b400d06ce159a299c2deeaf00dfabcdfc7b08ce WHIRLPOOL 3a10e1b1ce709ad9ed85d6522083c8e6875cd73b239911d91bf99a7b8761b6815795eb62925f21aeff9addd6cc1903eb3ea2b06adc2693143b87d91b24c33ea9
+EBUILD osc-0.139.1.ebuild 1457 SHA256 b3f1d1cdbc69700bbe907dd8bd6280c18c204b667e76681e17befb83a6d07429 SHA512 cfe99142c50d61aced80cd076722284389428c64b4ab41d76cf8484da3518cba753dcaadcb1648f0c7c8a1301827706d6c3b063ddaba1fe63efaa86653df8e76 WHIRLPOOL bf78eb18280843549acff13dd305574213f6c0f67f3eb3bc665eb338a53d4852154bdad957b7ded40a620a90a47c22762c55a3f8effd51a8cc6fd678e57470da
+EBUILD osc-9999.ebuild 1454 SHA256 c17e1e7fb35129f5e7eb518aaa1d5c3987185f2787351ee05f0415ae9bd4a0b9 SHA512 8184875838507afab3482fb72e1d5497a61c583d741c4598ab370dfa570ace174a35d32ccbbe76f5f3223dc38fb063111d9a3a3428c9f3bb5ffbdf6ba2fa33aa WHIRLPOOL 0bad0f7f6ac73375ffc38eb9f57ad13295de0bf6c0b229f570055efc6cc3fc5d266d1600a615fbf81c39943e627729ef0ee6bc094753426ebe1a59bbb9885185
+MISC ChangeLog 2174 SHA256 584acf3ce68a9c2cbd02340c6d79b448b7c6a786ca7d2331e39668cad85fd55b SHA512 95ed732319a28f4d4236e03d69a367cb3aeaaf53de84bfcaabae7a4e0ae6e26d165b07cb4093b9c81e9f0ce1e0edeceb513aef5281f6482dbda7a58cc22640cc WHIRLPOOL 3b6988b0e08198f557d9d6295528e46715faf010679bfb5da80da4a17f4858d3f03cc7042ac2120ba3d7c86a64a06ada883d9a86afdd7bca431372cf2770b3f7
 MISC metadata.xml 424 SHA256 4bf5a94b109655c334bb88c7902710dd20bb839cc7703b151cb0f4e81e16214b SHA512 fea1d6531a95d555bc7a18acb5cdfffc032f7d60fdf0eeff82d081567de202896c493cd34948b3872d0434c87bcaee1954dabd2029228578ae1d77f799e433c0 WHIRLPOOL 9c70abf73332bd9665013a3495e60a9f240d28e67ad88636ea7b2bda0a235ad664cad1848151edbb55a4c92a0b128d5eba1e665c347d56adbb3f77e941950d5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQzu0qAAoJEOSiRoyO7jvoNE0P/iyl94h4OLRkDmule+mvRZFv
-aKZoTb3erHKIOY9kdIu5TGDjKSWqArFlc7amJd52w4P37QyZycHEGuB4k37hegSZ
-L0rRxKleCvRDayx9SUQJs/QPO2Et4Lmx9U4zl72grgWho2LhM7hH4ZlfLgbAlS/p
-l0FDIrIwIIZkIuDw6c/ijaJdifQLl4//vmEAxjPaQutNsktx/2tiZS55aFN7Xh3Y
-8qTbigjPuiRuCq9UW26HqMcKVlNEKMoIKatPBSn2S1qOeJk+jSCKJoh4axZH7r5q
-fhMaMXN4lANyIUzcGiiTS1nBke22ZCIG0ciQskdRLRXhaGSKwb9tPhp/EuStO0ZK
-9bdi9FbWI8YE8EwrwORw9YA+cNgz5mflzGp2SG0oeDgiMZVbOFbgqTQyVbeFcMM2
-cuxotKYAwL/KMYYTTfH1e+71TpPQHQFCZUEMAGNib19oX3gQn4tXxppdg0JYk+mr
-UbeW/jqz9b9oN5BU5FXQLCeKMkwxfhS1cD3g4OISd83ZtRQ2hmVWcXW62GyRXItD
-BmtDpg1z92xtowYaDr6fLgZfE1Yg+7qN6q/N1LZVQ3lPb9cVGbVVFYdROQeruYbE
-0jmTuohdCi6Hzz0r8aHVwCOKho0SWvVLUNA2Qzt9Akp1Y5aUOwD+EaKiF88Q7D/a
-o5LW2724g7w+mVoM7t2+
-=BCfy
+iF4EAREIAAYFAlFG68IACgkQpFCI79Oct8W9TwD+JhTrUSYSWDvmEiN03fKipPVI
+m4oerEqxqb4xJ8R6T4AA/0qIgnn7JGSMCvdrIeF/J9Zs1BRV8cBYJnbrWPUiRSyb
+=ajCA
 -----END PGP SIGNATURE-----
diff --git a/dev-util/osc/osc-0.139.1.ebuild b/dev-util/osc/osc-0.139.1.ebuild
new file mode 100644
index 000000000000..b51add450304
--- /dev/null
+++ b/dev-util/osc/osc-0.139.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild,v 1.1 2013/03/18 10:26:27 miska Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
+PYTHON_DEPEND="2:2.6"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PROJECT="openSUSE:Tools"
+	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=""
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/urlgrabber
+	dev-python/pyxml
+	dev-python/elementtree
+	app-arch/rpm[python]
+	dev-python/m2crypto
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-util/obs-service-meta
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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/libexec/suse-build|g' {} +
+	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|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 4d08e4693f48..611fa276c638 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.7 2012/11/19 13:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.8 2013/03/18 10:26:27 miska Exp $
 
 EAPI=5
 
@@ -25,7 +25,10 @@ HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-[[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-python/urlgrabber
@@ -49,7 +52,8 @@ 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' {} +
+	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/libexec/suse-build|g' {} +
+	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
 	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
 }