[gentoo-commits] repo/gentoo:master commit in: dev-util/suse-build/files/, dev-util/suse-build/

[Tomas Chvatal]

commit:     58aeb743b735a6f868f88dfa6567cdb12c2b1ba1
Author:     Tomáš Chvátal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 10:32:57 2015 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 10:33:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58aeb743

[dev-util/suse-build] Update to latest version for openSUSE 42.1

Package-Manager: portage-2.2.24

 dev-util/suse-build/Manifest                       |   2 +-
 .../files/suse-build-20140220-libexec-paths.patch  | 212 ---------------------
 ...4.02.20.ebuild => suse-build-2015.11.05.ebuild} |  11 +-
 dev-util/suse-build/suse-build-9999.ebuild         |   4 +-
 4 files changed, 7 insertions(+), 222 deletions(-)

diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
index f88d30d..517c58e 100644
--- a/dev-util/suse-build/Manifest
+++ b/dev-util/suse-build/Manifest
@@ -1,2 +1,2 @@
-DIST obs-build-20140220.tar.gz 156717 SHA256 af959c30a9da0237cbb32a79dd55347156cd68d73f3c8f6e818a74b6c915b328 SHA512 3a66c7ded80f928d8930cb60011a115ec3d6ffa616a290907176fbe65e0dd0abc23b083271fb0d8598d699d1e6a100cc98be908f0079c0db157b8c4c6b960191 WHIRLPOOL 6609726de2f7d8f8d3e082b6323f4046d1121cc81fc58086d8666ddb677ac721e0e4be8597ba1316240d447c7942d2fd8f213bb39e4539c22e2ea0571a0812ce
 DIST obs-build-20140918.tar.gz 192320 SHA256 3b8263fa9f5320d34bcf7c731b5eda9bcedda5f65c2583a57f8640a925dcdbcf SHA512 3eddb6d131cbc405200add39c681365abc704965adb39f52a03936653dd9439d479f6ad8ee7492248399bb015f101c0e41396b70a205bde2cceea2c6646f7c51 WHIRLPOOL 79be4deca3806c2ffbbf2cb55d8e71e9f630b580fa87cfe2bd13bc81634cce83276701ca5bfb464c8bf3f0bbc01229716dbfb5d1da99c2c17d56d2666ef2dbfb
+DIST obs-build-20151105.tar.gz 231249 SHA256 e498bd32223b88bece019abfa23501bca7343ce1e8156e00f94200bb3ff24079 SHA512 7b6be4a0d6cd82501c05e41e2a08fa2ad30fe28f28ed72d06b2e4acfdb4d5d6759254291510e8797d214e6330d5c186a85d0f104454d0cde2221d94451bbfb23 WHIRLPOOL 86c4a59de6de6a9b1092a082d9ec15222cf55ace638f8843260485f19c90085a82dcd41ebe71fc31a2f130a5b30d2783624189333ba0e88cfb9651475a9f3b64

diff --git a/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch b/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
deleted file mode 100644
index 49b1813..0000000
--- a/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-diff -Naru obs-build-20140220-bak/build obs-build-20140220/build
---- obs-build-20140220-bak/build	2014-03-02 17:04:18.655731128 +0000
-+++ obs-build-20140220/build	2014-03-02 17:04:56.710281988 +0000
-@@ -12,7 +12,7 @@
-    exec /.build/build "$@"
- fi
- 
--test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
-+test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build
- test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
- test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
- 
-diff -Naru obs-build-20140220-bak/createarchdeps obs-build-20140220/createarchdeps
---- obs-build-20140220-bak/createarchdeps	2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/createarchdeps	2014-03-02 17:04:56.710281988 +0000
-@@ -3,7 +3,7 @@
- # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@×××××.com>
- 
- BEGIN {
--  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build");
-+  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build");
- }
- 
- use strict;
-diff -Naru obs-build-20140220-bak/createrepomddeps obs-build-20140220/createrepomddeps
---- obs-build-20140220-bak/createrepomddeps	2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/createrepomddeps	2014-03-02 17:04:56.710281988 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-diff -Naru obs-build-20140220-bak/createrpmdeps obs-build-20140220/createrpmdeps
---- obs-build-20140220-bak/createrpmdeps	2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/createrpmdeps	2014-03-02 17:04:56.710281988 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-diff -Naru obs-build-20140220-bak/createyastdeps obs-build-20140220/createyastdeps
---- obs-build-20140220-bak/createyastdeps	2014-03-02 17:04:18.656731116 +0000
-+++ obs-build-20140220/createyastdeps	2014-03-02 17:04:56.711281976 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-diff -Naru obs-build-20140220-bak/download obs-build-20140220/download
---- obs-build-20140220-bak/download	2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/download	2014-03-02 17:04:56.711281976 +0000
-@@ -3,7 +3,7 @@
- use Net::SSL ();
- BEGIN {
-   $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0,
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use LWP::UserAgent;
-diff -Naru obs-build-20140220-bak/expanddeps obs-build-20140220/expanddeps
---- obs-build-20140220-bak/expanddeps	2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/expanddeps	2014-03-02 17:04:56.711281976 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-diff -Naru obs-build-20140220-bak/getbinaryid obs-build-20140220/getbinaryid
---- obs-build-20140220-bak/getbinaryid	2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/getbinaryid	2014-03-02 17:04:56.711281976 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-diff -Naru obs-build-20140220-bak/getoptflags obs-build-20140220/getoptflags
---- obs-build-20140220-bak/getoptflags	2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/getoptflags	2014-03-02 17:05:22.777976219 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-diff -Naru obs-build-20140220-bak/changelog2spec obs-build-20140220/changelog2spec
---- obs-build-20140220-bak/changelog2spec	2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/changelog2spec	2014-03-02 17:05:24.268958777 +0000
-@@ -5,7 +5,7 @@
- #
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Date::Parse;
-diff -Naru obs-build-20140220-bak/init_buildsystem obs-build-20140220/init_buildsystem
---- obs-build-20140220-bak/init_buildsystem	2014-03-02 17:04:18.655731128 +0000
-+++ obs-build-20140220/init_buildsystem	2014-03-02 17:05:24.268958777 +0000
-@@ -16,7 +16,7 @@
- export YAST_IS_RUNNING="instsys"
- export DEBIAN_FRONTEND=noninteractive
- export DEBIAN_PRIORITY=critical
--export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
-+export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
- # need to restore build root owner for non-root builds
- browner=0
- definesnstuff=()
-diff -Naru obs-build-20140220-bak/initvm.c obs-build-20140220/initvm.c
---- obs-build-20140220-bak/initvm.c	2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/initvm.c	2014-03-02 17:05:24.269958765 +0000
-@@ -54,9 +54,10 @@
- #define SYSFS_BINFMT_MISC_REG	"/proc/sys/fs/binfmt_misc/register"
- #define SYSFS_BINFMT_MISC_STAT	"/proc/sys/fs/binfmt_misc/status"
- 
--/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */
-+/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */
- #define BINFMT_REGF_0		"/.build/qemu-reg"
--#define BINFMT_REGF_1		"/usr/lib/build/qemu-reg"
-+#define BINFMT_REGF_1		"/usr/libexec/suse-build/qemu-reg"
-+#define BINFMT_REGF_2		"/usr/lib/build/qemu-reg"
- #define BUILD			"/.build/build"
- 
- /* useful constant arrays */
-@@ -324,9 +325,13 @@
- 			fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
- 				BINFMT_REGF_0);
- 			if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
--				fprintf(stderr, "%s: binfmt registration failed\n",
-+				fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
- 					BINFMT_REGF_1);
--				exit(1);
-+				if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) {
-+					fprintf(stderr, "%s: binfmt registration failed\n",
-+						BINFMT_REGF_2);
-+					exit(1);
-+				}
- 			}
- 		}
- 	}
-diff -Naru obs-build-20140220-bak/mkdrpms obs-build-20140220/mkdrpms
---- obs-build-20140220-bak/mkdrpms	2014-03-02 17:04:18.656731116 +0000
-+++ obs-build-20140220/mkdrpms	2014-03-02 17:05:24.269958765 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, '/usr/lib/build';
-+  unshift @INC, '/usr/libexec/suse-build';
-   unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'};
- }
- 
-diff -Naru obs-build-20140220-bak/order obs-build-20140220/order
---- obs-build-20140220-bak/order	2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/order	2014-03-02 17:05:24.269958765 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-diff -Naru obs-build-20140220-bak/spectool obs-build-20140220/spectool
---- obs-build-20140220-bak/spectool	2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/spectool	2014-03-02 17:05:24.269958765 +0000
-@@ -116,7 +116,7 @@
- my $builddir;
- 
- BEGIN {
--  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
-   unshift @INC, $builddir;
- }
- 
-diff -Naru obs-build-20140220-bak/substitutedeps obs-build-20140220/substitutedeps
---- obs-build-20140220-bak/substitutedeps	2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/substitutedeps	2014-03-02 17:05:24.269958765 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;

diff --git a/dev-util/suse-build/suse-build-2014.02.20.ebuild b/dev-util/suse-build/suse-build-2015.11.05.ebuild
similarity index 86%
rename from dev-util/suse-build/suse-build-2014.02.20.ebuild
rename to dev-util/suse-build/suse-build-2015.11.05.ebuild
index ca7de4d..22be49b 100644
--- a/dev-util/suse-build/suse-build-2014.02.20.ebuild
+++ b/dev-util/suse-build/suse-build-2015.11.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="symlink"
 [[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	virtual/perl-Digest-MD5
@@ -40,10 +40,6 @@ RDEPEND="
 
 S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
 
-src_prepare() {
-	epatch "${FILESDIR}/suse-build-20140220-libexec-paths.patch"
-}
-
 src_compile() { :; }
 
 src_install() {
@@ -57,7 +53,8 @@ src_install() {
 		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.2.conf /usr/libexec/suse-build/configs/default.conf
+	dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
 }

diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
index 3056206..2e11350 100644
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -56,5 +56,5 @@ src_install() {
 	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.2.conf /usr/libexec/suse-build/configs/default.conf
+	dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
 }