reinit the tree, so we can have metadata

6 files changed, 652 insertions, 0 deletions

diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
new file mode 100644
index 000000000000..ed023ade0bd4
--- /dev/null
+++ b/dev-util/suse-build/Manifest
@@ -0,0 +1,9 @@
+AUX suse-build-2014.09.18-libexec-paths.patch 14173 SHA256 b3844618969ab85e6c1041cfdd2d2d96311a60dcd3cf59da8640b8df394d63b7 SHA512 e808c32eeb0c29c9b7db97129634c9fc35a5bb7fc376601051329cd2508aad2a0342404cffb299dde515f4792d26c4be460c738bea90574d113241821339fe69 WHIRLPOOL 513c7a34504f1d578b10d6e8ff2fbe4683002eb6d16d429fe16ffd81d730244647039f45af8b22cfc64fefc80e10bef3f6a9116fa0cf5a2c47fb8c6f6ed218e9
+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
+EBUILD suse-build-2014.09.18.ebuild 1457 SHA256 42ab8129f2af25ad754df313c5fbe52c89a621a67c82f6d73328ba22b8f49077 SHA512 256f57f73173d20d9e988ac5ceec3b621373e402acd744494b78ff80fa3df6ef4e475ba3936c3290d74abfa68c098a1c72894132c8a5a119caf2e55450e06fce WHIRLPOOL 68f69b7eb4e2c7e46a027feb152d8223d06069b3af6a0cc5c268c6d4a34100fa39c90a054e1f7faaec7bb3b93b6f21b7471960642455b70d99c2eb2e373e7e5a
+EBUILD suse-build-2015.11.05.ebuild 1469 SHA256 7e82a7d6a8672ebc695769c35bc4d9c86be5dd9708e8311b7600723a554e4220 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34 WHIRLPOOL f1f4cb19826b53918662dce158b53e11d9d462c53a533ee5969a5c516b1d936352e7c856f1742509c0a0768491801ba3792fc1e0f406d4853d06153f3f8081cb
+EBUILD suse-build-9999.ebuild 1469 SHA256 7e82a7d6a8672ebc695769c35bc4d9c86be5dd9708e8311b7600723a554e4220 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34 WHIRLPOOL f1f4cb19826b53918662dce158b53e11d9d462c53a533ee5969a5c516b1d936352e7c856f1742509c0a0768491801ba3792fc1e0f406d4853d06153f3f8081cb
+MISC ChangeLog 3394 SHA256 7aa16cf4b0b7040fadabd2b01ab44eb7336dc9fa99a1f88a619019ee4453371f SHA512 9361a384e222284f36b98d47f41d11a9653f441de6a9299708a521b9c7f5c1c1822673297e0955da937dac498c32caa24841f323a3b23ac32255256d3b8ef734 WHIRLPOOL ad4e570bb4702e1ba7737ba4ed5425ea9a77e63c283da62c36b3e4a1d4d200caa252b984dc99ea7a13d9f85273d015c603824f8d23234e4d3c430f0f7ce52a50
+MISC ChangeLog-2015 5802 SHA256 9a20ec8e962a86d421d610e796c94e6f8457bb01e15d29533aae8a47fcf7991a SHA512 07f4bcf80a48b794514278ff74b2de3ff49ef230ec092267385eac26274365f8e33be9db655f7bccb44c94e2626b794a9938cc91db5c5f621507e9789037c893 WHIRLPOOL b56ea6b01f23b759c9414d2c4dfe67744aa4efefa9ffe350a62a39d9e81981854ab9034df301794b4da4ce7aba3c02ea75dc80ad848a06f16fc7f71387629aa3
+MISC metadata.xml 501 SHA256 e42e7ab464bcc3a50e064abfb512de3d47c7f14fc08051eb5ceec8be5bfc6cbe SHA512 1c56251b6dc033aa6fa01e196dbb0a6050a2542504ef5f415c9e758f21ff05b9886ce73826778ed1e49e44af5ea53d594868adb885e86e6a61c9640485dc5f81 WHIRLPOOL 7eb57068897169de41013e2880ae8b44b6b1cf2194d3d00eeed3c03f2130a702da0d8fb81c3627cf050d3dc016aeb9f9029858dea9907e04116546e78d6854a5
diff --git a/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch b/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch
new file mode 100644
index 000000000000..92bce8090858
--- /dev/null
+++ b/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch
@@ -0,0 +1,449 @@
+ build                  | 18 +++++++++---------
+ build-recipe-kiwi      |  4 ++--
+ build-recipe-livebuild |  4 ++--
+ build-recipe-spec      |  8 ++++----
+ changelog2spec         |  2 +-
+ createarchdeps         |  2 +-
+ createrepomddeps       |  2 +-
+ createrpmdeps          |  2 +-
+ createyastdeps         |  2 +-
+ createzyppdeps         |  2 +-
+ download               |  2 +-
+ expanddeps             |  4 ++--
+ getbinaryid            |  2 +-
+ init_buildsystem       |  2 +-
+ initvm.c               | 13 +++++++++----
+ mkdrpms                |  2 +-
+ order                  |  4 ++--
+ queryconfig            |  4 ++--
+ spectool               |  2 +-
+ substitutedeps         |  4 ++--
+ test/common            |  2 +-
+ 21 files changed, 46 insertions(+), 41 deletions(-)
+
+diff --git a/build b/build
+old mode 100755
+new mode 100644
+index 9f9fb72..fcfec70
+--- a/build
++++ b/build
+@@ -13,7 +13,7 @@ if test "$0" = /sbin/init ; then
+ fi
+ 
+ test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build
+-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"
+ 
+@@ -493,8 +493,8 @@ create_baselibs() {
+ 	if test -e $BUILD_ROOT$TOPDIR/SOURCES/baselibs.conf ; then
+ 	    BASELIBS_CFG="-c $TOPDIR/SOURCES/baselibs.conf"
+ 	fi
+-	if test -e $BUILD_ROOT/usr/lib/build/baselibs_global.conf; then
+-	    BASELIBS_GLOBAL="-c /usr/lib/build/baselibs_global.conf"
++	if test -e $BUILD_ROOT/usr/libexec/suse-build/baselibs_global.conf; then
++	    BASELIBS_GLOBAL="-c /usr/libexec/suse-build/baselibs_global.conf"
+ 	fi
+ 	pkgs=($RPMS)
+     fi
+@@ -503,14 +503,14 @@ create_baselibs() {
+     # don't use -R as extracted sources, build root etc might be below $TOPDIR
+     chown "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"/* "$BUILD_ROOT$TOPDIR"/RPMS/* || true
+ 
+-    local mkbaselibs="/usr/lib/build/mkbaselibs"
++    local mkbaselibs="/usr/libexec/suse-build/mkbaselibs"
+     local whichone=''
+     # $BUILD_DIR is set to /.build when using a vm. So we need to
+-    # hardcode /usr/lib/build instead of $BUILD_DIR to prefer
++    # hardcode /usr/libexec/suse-build instead of $BUILD_DIR to prefer
+     # mkbaselibs from the distro.
+     if test -f $BUILD_ROOT$mkbaselibs; then
+-	if test -z "$BASELIBS_CFG" -a -e $BUILD_ROOT/usr/lib/build/baselibs.conf ; then
+-	    BASELIBS_CFG="-c /usr/lib/build/baselibs.conf"
++	if test -z "$BASELIBS_CFG" -a -e $BUILD_ROOT/usr/libexec/suse-build/baselibs.conf ; then
++	    BASELIBS_CFG="-c /usr/libexec/suse-build/baselibs.conf"
+ 	fi
+     else
+ 	if test "$CREATE_BASELIBS" = 'internal'; then
+@@ -1274,7 +1274,7 @@ if test -n "$RPMS" -a -n "$BUILD_USER_ABUILD_USED" ; then
+     recipe_check_file_owners
+ fi
+ 
+-if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/lib/build/checks" ; then
++if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/libexec/suse-build/checks" ; then
+     export DO_RPM_REMOVE=true
+     # find package name
+     export PNAME=
+@@ -1282,7 +1282,7 @@ if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/lib/build/checks" ; then
+ 	test -f "$SRPM" && PNAME=`rpm --nodigest --nosignature -qp --qf "%{NAME}" $SRPM`
+     done
+     mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
+-    for CHECKSCRIPT in $BUILD_ROOT/usr/lib/build/checks/* ; do
++    for CHECKSCRIPT in $BUILD_ROOT/usr/libexec/suse-build/checks/* ; do
+ 	echo "... running ${CHECKSCRIPT##*/}"
+ 	$CHECKSCRIPT || cleanup_and_exit 1
+     done
+diff --git a/build-recipe-kiwi b/build-recipe-kiwi
+index 95afd3f..23cafb7 100644
+--- a/build-recipe-kiwi
++++ b/build-recipe-kiwi
+@@ -459,8 +459,8 @@ recipe_build_kiwi() {
+     fi
+ 
+     # Hook for running post kiwi build scripts like QA scripts if installed
+-    if test -x $BUILD_ROOT/usr/lib/build/kiwi_post_run ; then
+-	chroot $BUILD_ROOT su -c /usr/lib/build/kiwi_post_run || cleanup_and_exit 1
++    if test -x $BUILD_ROOT/usr/libexec/suse-build/kiwi_post_run ; then
++	chroot $BUILD_ROOT su -c /usr/libexec/suse-build/kiwi_post_run || cleanup_and_exit 1
+     fi
+ }
+ 
+diff --git a/build-recipe-livebuild b/build-recipe-livebuild
+index 6ae7046..c426ea0 100644
+--- a/build-recipe-livebuild
++++ b/build-recipe-livebuild
+@@ -172,9 +172,9 @@ recipe_build_livebuild() {
+     # TODO: Add the repository public key
+     # cp ... $BUILD_ROOT/$TOPDIR/$LIVEBUILD_ROOT/config/archives/debian.key
+ 
+-    if [ -x $BUILD_ROOT/usr/lib/build/livebuild_pre_run ] ; then
++    if [ -x $BUILD_ROOT/usr/libexec/suse-build/livebuild_pre_run ] ; then
+ 	echo "Running OBS build livebuild_pre_run hook"
+-	chroot $BUILD_ROOT su -c "/usr/lib/build/livebuild_pre_run" - root \
++	chroot $BUILD_ROOT su -c "/usr/libexec/suse-build/livebuild_pre_run" - root \
+ 	    < /dev/null || cleanup_and_exit 1
+     fi
+ 
+diff --git a/build-recipe-spec b/build-recipe-spec
+index b120f02..7a0b424 100644
+--- a/build-recipe-spec
++++ b/build-recipe-spec
+@@ -194,10 +194,10 @@ recipe_run_rpmlint() {
+ }
+ 
+ recipe_compare_oldpackages() {
+-    if test -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then 
++    if test -x "$BUILD_ROOT/usr/libexec/suse-build/same-build-result.sh" ; then 
+ 	echo "... comparing built packages with the former built"
+ 	mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
+-	if chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then 
++	if chroot $BUILD_ROOT /usr/libexec/suse-build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then 
+ 	    chroot $BUILD_ROOT touch /.build/.same_result_marker
+ 	    # XXX: dirty build service hack. fix bs_worker. Search for
+ 	    # 'same_result_marker' for traces of a first try to get rid of this
+@@ -210,9 +210,9 @@ recipe_compare_oldpackages() {
+ }
+ 
+ recipe_create_deltarpms() {
+-    if test -x "$BUILD_ROOT/usr/bin/makedeltarpm" -a -x $BUILD_ROOT/usr/lib/build/mkdrpms ; then
++    if test -x "$BUILD_ROOT/usr/bin/makedeltarpm" -a -x $BUILD_ROOT/usr/libexec/suse-build/mkdrpms ; then
+ 	echo "... creating delta rpms"
+ 	ds=("$BUILD_ROOT/$TOPDIR"/RPMS/* "$BUILD_ROOT$TOPDIR/SRPMS")
+-	chroot $BUILD_ROOT /usr/lib/build/mkdrpms /.build.oldpackages "${ds[@]#$BUILD_ROOT}"
++	chroot $BUILD_ROOT /usr/libexec/suse-build/mkdrpms /.build.oldpackages "${ds[@]#$BUILD_ROOT}"
+     fi
+ }
+diff --git a/changelog2spec b/changelog2spec
+old mode 100755
+new mode 100644
+index 4b94798..b87f4e1
+--- a/changelog2spec
++++ b/changelog2spec
+@@ -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 --git a/createarchdeps b/createarchdeps
+old mode 100755
+new mode 100644
+index 94efdb1..5e6795c
+--- a/createarchdeps
++++ b/createarchdeps
+@@ -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 --git a/createrepomddeps b/createrepomddeps
+old mode 100755
+new mode 100644
+index fad84e5..f2292a6
+--- a/createrepomddeps
++++ b/createrepomddeps
+@@ -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/createrpmdeps b/createrpmdeps
+old mode 100755
+new mode 100644
+index c8c796d..c890df1
+--- a/createrpmdeps
++++ b/createrpmdeps
+@@ -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 --git a/createyastdeps b/createyastdeps
+old mode 100755
+new mode 100644
+index 43c83e7..094c532
+--- a/createyastdeps
++++ b/createyastdeps
+@@ -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 --git a/createzyppdeps b/createzyppdeps
+index 9abf693..e78937c 100755
+--- a/createzyppdeps
++++ b/createzyppdeps
+@@ -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/download b/download
+old mode 100755
+new mode 100644
+index b0a7c1f..d08770f
+--- a/download
++++ b/download
+@@ -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 --git a/expanddeps b/expanddeps
+old mode 100755
+new mode 100644
+index 48116d8..04b9c20
+--- a/expanddeps
++++ b/expanddeps
+@@ -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;
+@@ -10,7 +10,7 @@ use Build;
+ 
+ my ($dist, $rpmdeps, $archs, $configdir, $useusedforbuild, $installonly, $noinstall);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--dist') {
+diff --git a/getbinaryid b/getbinaryid
+old mode 100755
+new mode 100644
+index 55c57f6..8f06579
+--- a/getbinaryid
++++ b/getbinaryid
+@@ -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 --git a/init_buildsystem b/init_buildsystem
+old mode 100755
+new mode 100644
+index 9fec7aa..21c5d4f
+--- a/init_buildsystem
++++ b/init_buildsystem
+@@ -13,7 +13,7 @@
+ # needed globals variables
+ #
+ export SRC
+-export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
++export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
+ 
+ export YAST_IS_RUNNING=instsys
+ 
+diff --git a/initvm.c b/initvm.c
+index 55686ea..f922eb4 100644
+--- a/initvm.c
++++ b/initvm.c
+@@ -54,9 +54,10 @@ const int n_fields = 8;
+ #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/libexec/suse-build/qemu-reg"
+ #define BUILD			"/.build/build"
+ 
+ /* useful constant arrays */
+@@ -324,9 +325,13 @@ int main(int argc, char* argv[], char* env[])
+ 			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 --git a/mkdrpms b/mkdrpms
+old mode 100755
+new mode 100644
+index b3c13b3..11b929c
+--- a/mkdrpms
++++ b/mkdrpms
+@@ -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 --git a/order b/order
+old mode 100755
+new mode 100644
+index 2236b46..246b9fd
+--- a/order
++++ b/order
+@@ -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;
+@@ -9,7 +9,7 @@ use strict;
+ 
+ my ($dist, $archs, $configdir, $manifest);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--dist') {
+diff --git a/queryconfig b/queryconfig
+index f4d383c..bb1e018 100755
+--- a/queryconfig
++++ b/queryconfig
+@@ -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;
+@@ -10,7 +10,7 @@ use Build;
+ 
+ my ($dist, $archs, $configdir, $debug, $type, $argument);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--dist') {
+diff --git a/spectool b/spectool
+old mode 100755
+new mode 100644
+index ef05859..24bd500
+--- a/spectool
++++ b/spectool
+@@ -116,7 +116,7 @@ the algorithm is prepended with colon to the check sum.
+ my $builddir;
+ 
+ BEGIN {
+-  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+   unshift @INC, $builddir;
+ }
+ 
+diff --git a/substitutedeps b/substitutedeps
+old mode 100755
+new mode 100644
+index 54e540c..d327c42
+--- a/substitutedeps
++++ b/substitutedeps
+@@ -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;
+@@ -19,7 +19,7 @@ sub expand {
+ 
+ my ($dist, $buildroot, $rpmdeps, $archs, $configdir, $release, $changelog);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--root') {
+diff --git a/test/common b/test/common
+index 45c0da2..86a062b 100644
+--- a/test/common
++++ b/test/common
+@@ -22,7 +22,7 @@ if [ -e ${0%/*}/config.local ]; then
+ 	. ${0%/*}/config.local
+ fi
+ 
+-: ${BUILD_DIR:=/usr/lib/build}
++: ${BUILD_DIR:=/usr/libexec/suse-build}
+ 
+ #if [ ! -e "$build_vm_img" ]; then
+ #	sudo dd if=/dev/zero of="$build_vm_img" bs=512 count=0 seek=$((build_vm_image_size*2*1024))
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
new file mode 100644
index 000000000000..8b87c4da4729
--- /dev/null
+++ b/dev-util/suse-build/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>suse@gentoo.org</email>
+    <name>SUSE</name>
+  </maintainer>
+  <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>
+</pkgmetadata>
diff --git a/dev-util/suse-build/suse-build-2014.09.18.ebuild b/dev-util/suse-build/suse-build-2014.09.18.ebuild
new file mode 100644
index 000000000000..8861aedd9072
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2014.09.18.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="https://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}"/${P}-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-2015.11.05.ebuild b/dev-util/suse-build/suse-build-2015.11.05.ebuild
new file mode 100644
index 000000000000..15f352f1e641
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2015.11.05.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="https://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_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|' {} +
+
+	# create symlink for default build config
+	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
new file mode 100644
index 000000000000..15f352f1e641
--- /dev/null
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="https://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_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|' {} +
+
+	# create symlink for default build config
+	dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
+}