Fixing paths (bug#446074), version update, new symlink use flag (bug#433681)

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

5 files changed, 82 insertions, 24 deletions

diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index 0cf766821b4d..137c866f4c26 100644
--- a/dev-util/suse-build/ChangeLog
+++ b/dev-util/suse-build/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2012/12/17 10:02:37 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.12 2013/03/18 10:18:58 miska Exp $
+
+*suse-build-2013.02.27 (18 Mar 2013)
+
+  18 Mar 2013; Michal Hrusecky <miska@gentoo.org>
+  +suse-build-2013.02.27.ebuild, suse-build-9999.ebuild, metadata.xml:
+  Fixing paths (bug#446074), version update, new symlink use flag (bug#433681)
 
   17 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -suse-build-2012.09.27.ebuild, suse-build-2012.11.23.ebuild:
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
index ab046675485a..fe0eca491ae7 100644
--- a/dev-util/suse-build/Manifest
+++ b/dev-util/suse-build/Manifest
@@ -2,24 +2,16 @@
 Hash: SHA256
 
 DIST obs-build-20121123.tar.gz 141864 SHA256 db8e258a1deaac850536108fc8537fa81b3fef074c617fc790322659bbd32e99 SHA512 c7f3fefc67e0f90f1017750349c090a5757532b65aa01cfa5f7e34fb2bfd4f198d3dc02d7f8866e62afc2cf4159a4ada0a0887db84576f4ddc5efdc6f8012b50 WHIRLPOOL 9a04d99d76861dfd177195857d592fd75f9b69f660567ce64c1c0092023a94c6e535de6e91f3e3e19304e28db679a791c2d931d8ac734f6b480d5584565dbfea
+DIST obs-build-20130227.tar.gz 147092 SHA256 231c6b5c31e07dfedbd1b0a5ec30040529639bf376994b8c2837f3a9a3c3e0de SHA512 6b27c70a44dbb2d0bee7113d84eb3671b8ac8a09b9dc676d0989d93e6cc5f55033f14f67b012d8dad846179ff6f095190e897e14af5c52cdce1b9d98554777a4 WHIRLPOOL 5b25f55a5fe3919c1ac97228d87cb406bf657eb74cdedb169f236023fa7dd3d978ee699a2cc9755bdba5a070df83f69709f63667f8da5eea2a2fb13c1b26a18d
 EBUILD suse-build-2012.11.23.ebuild 1332 SHA256 3fffd37347ee61870eff4d5b92d67316b4fdc58a1156b0386899e7801f7edcc8 SHA512 bd0744a5003f7ba17a28808fb152757ebc0977962883b5fbdb7dd7d90dc21e447cf05efbd83d7734cf347f9528c17617918289318ccc0a28a04718ab3f6d7138 WHIRLPOOL 70eab50ba39b7cf678beed861c9eb86636f2ad9b715229b8c7e961c3862e73c841139accec7ec668b8bd57e99923964eec82e5c0263f4bde157b1112296d60ce
-EBUILD suse-build-9999.ebuild 1328 SHA256 65f5921fd5d50dabe6f0a4a27f5da869ecee76fd46543e41de9a8b563859bc7e SHA512 443acc8972a1bfe315a456e0630d3b4619a3025773253a04d8c64a3263635819490054500ec3fb056f99efb784476528013dfbda827630f8b7495cb01e497f06 WHIRLPOOL 9148270050e76f2105222a0e0a408bb55672a411ff51fb20f8ef252f3de21996d7f4a6e7df626c37c4f4425b2aa37f9a563ec0f519a56c74443010f922d7ac2b
-MISC ChangeLog 2335 SHA256 a26e18d97b280f8594252d4e3a988a8257c7275637e8ae8aa9b4b19194a2a113 SHA512 ec804bb7957f2dbcfc5613ce0de8ee768eb2c4ee68dae264bd131a8bac0cc068089ef04ce3daa0c34307441e95f9c9e35c48013f689e730c21b9f9528428ee43 WHIRLPOOL dd34f2b4cef1de48ad016f87a0708f853a397ca8c853f847ad5ce93d019eb7d947bf6473329e5742a0b5d78d54123472cf80aa1a868726808cb4e824b5cc664f
-MISC metadata.xml 270 SHA256 dcca2d8e3bb3ed212cb99f15150c40690ac6d835789e5c3e03729606c96c6a80 SHA512 8ab2112db1656b0e1609d6ef66c6d0e70545b509d070f53af577f1f2ea6111867d0b8cb82432467772a8ff8707334ceaea963fbd4fccfcf1cb717d0996c75f3f WHIRLPOOL ff142d4d0f236508a2bbe21760653aab8fcbcac00767d5c9bdbe7aa225f19da732b0efe02cafaec0e82fe0ec997e1c1b07f77468edff4deda99c68b095ef3713
+EBUILD suse-build-2013.02.27.ebuild 1452 SHA256 97363e07211ac542b84676d48d22e80ed592f52a1280d15b476885ed13552622 SHA512 7ed1a5aac8acd284eb01030611be4ca2a23d837a1f288041a2c1e6758cb69edae7a18f59f1c3892afedbab1e520ada95e0e02a5ed6e670c3e800d0bf4e151a72 WHIRLPOOL fb185bbf057fdb5b6382d4443202744d8ffe35089625b0552e41a4403d7b7ec348d00f6887ff21022fcff9808cfd5f52beb6621bb666160759a9df16c68fe2a7
+EBUILD suse-build-9999.ebuild 1444 SHA256 5c740b81d9becb1c8e64395357c937b68464dc5dd252a2c2e5343d5921372329 SHA512 87a8fd8c805c11a76dfbaca7202e7f5c962c329f0f688393bb364f169116eae78b5f12e4aee94e2fe395c93d55abf27b34bceef57c5d361c386b6b3c70b83177 WHIRLPOOL 53dbed65307e3a15f0853136472d86017d5524a188569575371b79ac4922142b69e85c1995e2f3fd942c95e4362c2bcd71a488ab324c063a1d9becbeda16e5b1
+MISC ChangeLog 2570 SHA256 1afe4e8967d60e857cd197de3798013860ad77c39ccd37fe3809e0f3e6b90021 SHA512 397ceecaf4bc04aa415562549a8f053793c82310ed1e4e9c7b46edc2701c85d55e81851a30537c5192f6e1c2562b47f330735af2f1f17118f203aca25e0638fb WHIRLPOOL 5fc53d970db4de3c4109afc2f55fc317b5f4e83061e8e4d372bf6a66a2b1ce3c18f63cbfcfe6e450459f566c9c4e45c337d296d94305d87fec2f1715fe3f0657
+MISC metadata.xml 409 SHA256 cc5c5706ac5406afec663da06a93e4c91f96c2ad3dce51e7a6769d8da9031205 SHA512 e27aada2ced11515a108f0203cad9a6cede66c3d33ea91846113a118933107024fabefb5cdfdb8d6159058d4fd3e962d29a205fc637df976a156582e48e60e7b WHIRLPOOL c62713b4d1e52190ba07d06e604b672244efbbe76d95b29565487035a4e77956b348daa59355011c80bfae0860435844285a60c76b9714c5c4fdeb77f6f1f4b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQzu2kAAoJEOSiRoyO7jvomD0P/3OXy+aoRUBPDPGZqrUELt/c
-6TIAnue8SNkgpCweOG1TBsjrgu6FIJ4IjOe+RUZZpAflbAPNVwM5ANsaWjueoXEn
-pBSwH96fNi/j/aJR0Q1AzcjN6FAFTXMFqf1x+zqj8+mgZSHEiEch25vdOHdi7/yp
-XiOUBCElHq4VIA1nr44WAJSQz7kWXse1zjHUu5sFpnLwIl4ydhko8RnPr0CXZ+SQ
-xqKjjrYrBqaQ//8+sg1e0yK2nXtH9z17ByXhPjvQEJHl3+i5BCw2O7WdHmsCb6JR
-YD25lVw+TBxNFd6FF1tQ/9Q6zOuBUNiQNhFH7cyJmizZekwf2x3rYHehrCqUBXIK
-4dH5kwMx5Xjl368b+eOwqrXwXPynhXnQdlwqYwv1XlDI0Jl1LyMv1lCKLO/CQiuX
-vB6FlPwK7zWzMS2GF0/CTMny9ZBUl+v2lmLAlCDVl9qpEGQX2uHDY+nIGe344Hdx
-S4ZzphgMVR9OIZ5D3y8xLHnYsJz2ugPjPaRhUaA0qEnbv1KOvy1eFCXDhyO1/Syo
-3zQRkvzyDo7jkDBrIUiSoL41esoHGp0Ff1k/gzBA9kCN1KSEvLekKwkz+O0gcQ60
-TXEAkRYp2nq+DyiBH2S2F+JzKJUDLucEUaXkV/RiuvLnQLVrrsLX154xjcwbN7n8
-kf2j9wy6QuyKR/dLGdeh
-=b/PJ
+iF4EAREIAAYFAlFG6gkACgkQpFCI79Oct8XutgD/SZt1sDr5+yQ9w0kj1NtsaRM1
+S2IEiUXjcDoT3j/IvM8BAJy+SOYni88D/NC4T8wZKntEeh0Jl28ocz7Op9ZBBOHE
+=AREy
 -----END PGP SIGNATURE-----
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
index 6ed8468c9609..be999720f2e0 100644
--- a/dev-util/suse-build/metadata.xml
+++ b/dev-util/suse-build/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>suse</herd>
+<use>
+  <flag name='symlink'>Provide compatibility symlinks with original openSUSE package (might clash with other packages)</flag>
+</use>
 <longdescription lang="en">
 Script for building RPMs for SUSE Linux in a chroot environment.
 </longdescription>
diff --git a/dev-util/suse-build/suse-build-2013.02.27.ebuild b/dev-util/suse-build/suse-build-2013.02.27.ebuild
new file mode 100644
index 000000000000..dd6613c24baf
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2013.02.27.ebuild
@@ -0,0 +1,55 @@
+# 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.02.27.ebuild,v 1.1 2013/03/18 10:18:58 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?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/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|' {} +
+}
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
index eb90dbf0fddf..8f37e08da855 100644
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -1,8 +1,8 @@
-# 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/suse-build/suse-build-9999.ebuild,v 1.5 2012/10/02 11:17:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.6 2013/03/18 10:18:58 miska Exp $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://github.com/openSUSE/obs-build.git"
 
@@ -24,7 +24,7 @@ HOMEPAGE="https://build.opensuse.org/package/show?package=build&project=openSUSE
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="symlink"
 [[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
@@ -41,13 +41,15 @@ S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
 src_compile() { :; }
 
 src_install() {
-	emake DESTDIR="${ED}" pkglibdir=/usr/share/suse-build 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/share/suse-build|' {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
 }