r1 ebuild with patch replacing paths only where needed

* fixes running checks during build of openSUSE packages
updated copyright everywhere

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D39CB7C5)

5 files changed, 326 insertions, 6 deletions

diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index 1024c989c880..b6c52796042f 100644
--- a/dev-util/suse-build/ChangeLog
+++ b/dev-util/suse-build/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/suse-build
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.19 2013/11/02 09:05:08 scarabeus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.20 2014/01/28 13:35:22 miska Exp $
+
+*suse-build-2013.10.15-r1 (28 Jan 2014)
+
+  28 Jan 2014; Michal Hrusecky <miska@gentoo.org> suse-build-2013.10.15.ebuild,
+  +suse-build-2013.10.15-r1.ebuild, suse-build-9999.ebuild,
+  +files/suse-build-20131015-libexec-paths.patch:
+  r1 ebuild with patch replacing paths only where needed
+  * fixes running checks during build of openSUSE packages
+  updated copyright everywhere
 
   02 Nov 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   -suse-build-2013.05.17-r1.ebuild, suse-build-2013.10.15.ebuild:
diff --git a/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch b/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch
new file mode 100644
index 000000000000..10e9bd880479
--- /dev/null
+++ b/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch
@@ -0,0 +1,248 @@
+diff -Naru obs-build-20131015.orig/build obs-build-20131015/build
+--- obs-build-20131015.orig/build	2014-01-28 12:31:51.126824118 +0000
++++ obs-build-20131015/build	2014-01-28 12:31:23.973477260 +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-20131015.orig/createarchdeps obs-build-20131015/createarchdeps
+--- obs-build-20131015.orig/createarchdeps	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/createarchdeps	2014-01-28 12:31:23.976477299 +0000
+@@ -3,7 +3,7 @@
+ # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@gmail.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-20131015.orig/createrepomddeps obs-build-20131015/createrepomddeps
+--- obs-build-20131015.orig/createrepomddeps	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/createrepomddeps	2014-01-28 12:31:23.976477299 +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-20131015.orig/createrpmdeps obs-build-20131015/createrpmdeps
+--- obs-build-20131015.orig/createrpmdeps	2014-01-28 12:31:51.129824157 +0000
++++ obs-build-20131015/createrpmdeps	2014-01-28 12:31:23.976477299 +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-20131015.orig/createyastdeps obs-build-20131015/createyastdeps
+--- obs-build-20131015.orig/createyastdeps	2014-01-28 12:31:51.127824131 +0000
++++ obs-build-20131015/createyastdeps	2014-01-28 12:31:23.974477273 +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-20131015.orig/download obs-build-20131015/download
+--- obs-build-20131015.orig/download	2014-01-28 12:31:51.129824157 +0000
++++ obs-build-20131015/download	2014-01-28 12:31:23.976477299 +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-20131015.orig/expanddeps obs-build-20131015/expanddeps
+--- obs-build-20131015.orig/expanddeps	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/expanddeps	2014-01-28 12:31:23.975477286 +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-20131015.orig/getbinaryid obs-build-20131015/getbinaryid
+--- obs-build-20131015.orig/getbinaryid	2014-01-28 12:31:51.129824157 +0000
++++ obs-build-20131015/getbinaryid	2014-01-28 12:31:23.976477299 +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-20131015.orig/getchangetarget obs-build-20131015/getchangetarget
+--- obs-build-20131015.orig/getchangetarget	2014-01-28 12:31:51.129824157 +0000
++++ obs-build-20131015/getchangetarget	2014-01-28 12:31:23.976477299 +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-20131015.orig/getmacros obs-build-20131015/getmacros
+--- obs-build-20131015.orig/getmacros	2014-01-28 12:31:51.129824157 +0000
++++ obs-build-20131015/getmacros	2014-01-28 12:31:23.976477299 +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-20131015.orig/getoptflags obs-build-20131015/getoptflags
+--- obs-build-20131015.orig/getoptflags	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/getoptflags	2014-01-28 12:31:23.976477299 +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-20131015.orig/gettype obs-build-20131015/gettype
+--- obs-build-20131015.orig/gettype	2014-01-28 12:31:51.127824131 +0000
++++ obs-build-20131015/gettype	2014-01-28 12:31:23.974477273 +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-20131015.orig/changelog2spec obs-build-20131015/changelog2spec
+--- obs-build-20131015.orig/changelog2spec	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/changelog2spec	2014-01-28 12:31:23.975477286 +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-20131015.orig/init_buildsystem obs-build-20131015/init_buildsystem
+--- obs-build-20131015.orig/init_buildsystem	2014-01-28 12:31:51.125824105 +0000
++++ obs-build-20131015/init_buildsystem	2014-01-28 12:31:23.973477260 +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-20131015.orig/initvm.c obs-build-20131015/initvm.c
+--- obs-build-20131015.orig/initvm.c	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/initvm.c	2014-01-28 12:31:23.975477286 +0000
+@@ -53,9 +53,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 */
+@@ -307,9 +308,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-20131015.orig/mkdrpms obs-build-20131015/mkdrpms
+--- obs-build-20131015.orig/mkdrpms	2014-01-28 12:31:51.127824131 +0000
++++ obs-build-20131015/mkdrpms	2014-01-28 12:31:23.974477273 +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-20131015.orig/order obs-build-20131015/order
+--- obs-build-20131015.orig/order	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/order	2014-01-28 12:31:23.975477286 +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-20131015.orig/spectool obs-build-20131015/spectool
+--- obs-build-20131015.orig/spectool	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/spectool	2014-01-28 12:31:23.975477286 +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-20131015.orig/substitutedeps obs-build-20131015/substitutedeps
+--- obs-build-20131015.orig/substitutedeps	2014-01-28 12:31:51.128824144 +0000
++++ obs-build-20131015/substitutedeps	2014-01-28 12:31:23.976477299 +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-2013.10.15-r1.ebuild b/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild
new file mode 100644
index 000000000000..8b748d0b8a89
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 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.10.15-r1.ebuild,v 1.1 2014/01/28 13:35:22 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/openSUSE:Tools/build"
+
+[[ "${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/cpio
+	app-arch/rpm
+"
+
+S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
+
+src_prepare() {
+	epatch "${FILESDIR}/suse-build-20131015-libexec-paths.patch"
+}
+
+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
+
+	# create symlink for default build config
+	dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
+}
diff --git a/dev-util/suse-build/suse-build-2013.10.15.ebuild b/dev-util/suse-build/suse-build-2013.10.15.ebuild
index 90fd2c33b21e..50b0dfe938aa 100644
--- a/dev-util/suse-build/suse-build-2013.10.15.ebuild
+++ b/dev-util/suse-build/suse-build-2013.10.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.10.15.ebuild,v 1.2 2013/11/02 09:05:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.10.15.ebuild,v 1.3 2014/01/28 13:35:22 miska Exp $
 
 EAPI=5
 
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
index 0015dd96eced..d90e89698d7f 100644
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.9 2013/11/02 09:03:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.10 2014/01/28 13:35:22 miska Exp $
 
 EAPI=5