Updated to new version 20140220

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

3 files changed, 283 insertions, 1 deletions

diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index 39a3cdb14de6..f7e887849e2d 100644
--- a/dev-util/suse-build/ChangeLog
+++ b/dev-util/suse-build/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/suse-build
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.22 2014/02/25 12:49:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.23 2014/03/02 17:28:39 miska Exp $
+
+*suse-build-2014.02.20 (02 Mar 2014)
+
+  02 Mar 2014; Michal Hrusecky <miska@gentoo.org>
+  +suse-build-2014.02.20.ebuild,
+  +files/suse-build-20140220-libexec-paths.patch:
+  Update to new version 20140220
 
   25 Feb 2014; Tomáš Chvátal <scarabeus@gentoo.org>
   -suse-build-2013.10.15-r1.ebuild, -suse-build-2013.10.15.ebuild,
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
new file mode 100644
index 000000000000..49b1813a66e0
--- /dev/null
+++ b/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
@@ -0,0 +1,212 @@
+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@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-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-2014.02.20.ebuild
new file mode 100644
index 000000000000..89bd8706b119
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2014.02.20.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-2014.02.20.ebuild,v 1.1 2014/03/02 17:28:39 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-20140220-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
+}