summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2014-04-21 07:23:48 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2014-04-21 07:23:48 +0000
commitcc749202c8348c032a2b943fa2bdf9d60a8d66ae (patch)
treed716150b2eea28e793c1ae189be72750daf416c7 /dev-util/suse-build
parentMake multilib_is_native_abi equivalent to multilib_build_binaries, until all ... (diff)
downloadhistorical-cc749202c8348c032a2b943fa2bdf9d60a8d66ae.tar.gz
historical-cc749202c8348c032a2b943fa2bdf9d60a8d66ae.tar.bz2
historical-cc749202c8348c032a2b943fa2bdf9d60a8d66ae.zip
Stabilise on amd64 and x86. Drop older.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'dev-util/suse-build')
-rw-r--r--dev-util/suse-build/ChangeLog7
-rw-r--r--dev-util/suse-build/Manifest27
-rw-r--r--dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch248
-rw-r--r--dev-util/suse-build/suse-build-2013.12.05.ebuild63
-rw-r--r--dev-util/suse-build/suse-build-2014.02.20.ebuild4
5 files changed, 30 insertions, 319 deletions
diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index f7e887849e2d..509b7b809d46 100644
--- a/dev-util/suse-build/ChangeLog
+++ b/dev-util/suse-build/ChangeLog
@@ -1,6 +1,11 @@
# 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.23 2014/03/02 17:28:39 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.24 2014/04/21 07:23:40 scarabeus Exp $
+
+ 21 Apr 2014; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/suse-build-20131015-libexec-paths.patch, -suse-build-2013.12.05.ebuild,
+ suse-build-2014.02.20.ebuild:
+ Stabilise on amd64 and x86. Drop older.
*suse-build-2014.02.20 (02 Mar 2014)
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
index 586d54251e8c..9380351f5641 100644
--- a/dev-util/suse-build/Manifest
+++ b/dev-util/suse-build/Manifest
@@ -1,9 +1,26 @@
-AUX suse-build-20131015-libexec-paths.patch 9154 SHA256 cf99f71144e0dc1f9d9069acb6d648f284c22fb66d731ffd7614509ec2830ec1 SHA512 754809455b59bb2427a1129d311210809acc0132a76b8749806f85b0c0a329e477bf8891878d3be983f24e545f76f7569475bf80a729680e4566b57bf1ee0e86 WHIRLPOOL d9e41702106c15faf11cc58831229127038e224fd112eeab3d4f409898cadb10f5bcb9996bd3684f9c34bcf485fe9c8c605d8f3fb35a2026bb246bb975088ced
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX suse-build-20140220-libexec-paths.patch 7874 SHA256 b3f7561bec4780c4092574c94a70dbdc51ea3dfb13846d6868dccbf148debcfc SHA512 13d967ca71e34169eea5be7215363666b99e5f308609555f0f85c844cb0723f022ae2b71e28b5b3051bab518dd6bbdff656593443cbdbde28a78c88e30d62527 WHIRLPOOL 10f135efbec31de56bd57e774920fbd7116686f57c79362aaa9d3fc0f09b52800b08efcdafffcd7759759390dc232cc85c15475412b61b7f824403b32dd0a266
-DIST obs-build-20131205.tar.gz 155926 SHA256 38e208837a16c86862c04ff547de910e9cf30ffe0622c10d041b523a37671b48 SHA512 96e993ef619baadff744b62be520b384b7ab8ef1d6f56c269b77244c0f9eed5cbbb431ff52c42302024a46a2774bacdc720feb899c116cb6301de0887caa37c0 WHIRLPOOL 3945093a9be62a6a468d45069603a9508b42a85d0b632777ea3fd707540cbf339be31af679879cac0d3e9f0671b8b3c26cfbeb491a788df7efbdf9c0989c33b5
DIST obs-build-20140220.tar.gz 156717 SHA256 af959c30a9da0237cbb32a79dd55347156cd68d73f3c8f6e818a74b6c915b328 SHA512 3a66c7ded80f928d8930cb60011a115ec3d6ffa616a290907176fbe65e0dd0abc23b083271fb0d8598d699d1e6a100cc98be908f0079c0db157b8c4c6b960191 WHIRLPOOL 6609726de2f7d8f8d3e082b6323f4046d1121cc81fc58086d8666ddb677ac721e0e4be8597ba1316240d447c7942d2fd8f213bb39e4539c22e2ea0571a0812ce
-EBUILD suse-build-2013.12.05.ebuild 1596 SHA256 dfc6887b515c8ad291ec7d328f1c15949eb65b4fe269e8adb55de2781f45a04f SHA512 8ea19a9a22213e5afd0bd51486084dc72ddcfce49e2d720ff2e3f02be3f5b4e39482705fadcf63642bc1b50b72d75e4f29422da09b3ab28782e7189f41f3358d WHIRLPOOL d14f03db542e0610af0827200f1a98609ed9d74a461d77e38d70e0adab39535af02e0c5e0d612d956ee9a0646c36c470cc45b589336f66800ea33de4a0a28b37
-EBUILD suse-build-2014.02.20.ebuild 1594 SHA256 0a0cf7df8f1b1b9bbc5020f1282e9627a07ee2f191ac45ba25825d660846d3b6 SHA512 48793d49be81f7f746ff5d387a6a25e23a914c9daf80f8a25f40b30501dff3b818a004833cbc57d25f943ad8dbe8bc1de002b7e7f050ad98ca44e5733bb45508 WHIRLPOOL b37551b8cffb461b7c5fa3027fa250b4f2598403a133672e482752b18d0e281b0375b7e621f9293f8dee547223562ede7d4ffbe2416ae43c3c71aad45294b99d
+EBUILD suse-build-2014.02.20.ebuild 1596 SHA256 f9048390e16441949981ce6d773f9081e448e25a236b72a39a497fd05b290697 SHA512 56948743c429c42b3a6916ff6160b2e87d036026056bdb4c58ee615ab8e1e9111c66abc887b20f7a36f1afca5b80a668ba93e0d6b39367ed3e844fdb9e4fe895 WHIRLPOOL 42fbcf46f0bafb6bb2a61f0715ef1f10ca43013904b9bea3ca541bffb5bf3f295093113c4d4d6ce04709786b2bf9bbad93db428ad459c2c7c3f03e6ded72e488
EBUILD suse-build-9999.ebuild 1584 SHA256 4944b2efb155449fcc23ab8746a1e464653b914b1ba43cdd7cbcffac4582d877 SHA512 b7fe4db0f494011d6963f609a98443c248ecb8a16d169004ab393978644c612f6fa604c30c47f4f775ae5f87d3a9236ecb6bf8b178429b57571b77d62f7c1bad WHIRLPOOL 5d12d82c0bb31f594690d6916402f623ff4dc4ee61861a98cab94623c41d1bc474ff00d29622df136ea26c57ae2fac18a2b8ce1e5630e23557ebf81fd16bc657
-MISC ChangeLog 4913 SHA256 4134d6f71503f416a9808af43bdb825281126dcd011d6f6e84ef44689cce7e72 SHA512 cc28fddf1a308bdbbd75fa9ae230235988fbbe0a42ab7d828e173f35b3ace9ea8709baaf42ec0958ac1ced8b979b599622a435af1e1358735a05c8c2116292e2 WHIRLPOOL 6bd17bf6d7e94a372e4f2306f78b2f0cbedf2a4c72925dd5d83877f13ef5513cc7e2fa9c68611da138adf3a9cd836217aad5c0cbb6e125d2f6af882fd7d2a2f7
+MISC ChangeLog 5128 SHA256 7f50c0c303124676cf0a3870ece960338448d40a7fc692926c88b2bb31dd30b9 SHA512 41f037035174919306a7f542f61f0425b19e239a84d880ed6b26094988e101b70844f4ba1270dcffa1cbb2d9cbcfcd5b6c7d4abaabc87b0f1e15e098f2dfe5fc WHIRLPOOL 8675ba7e73b08301f0b4ed254932ceddab06714865568fe35ada5ca158e1ff7fa78437a57643cc6330804927ca67b1dbaf4b688819b168b29882b3cfad1c0bdf
MISC metadata.xml 409 SHA256 cc5c5706ac5406afec663da06a93e4c91f96c2ad3dce51e7a6769d8da9031205 SHA512 e27aada2ced11515a108f0203cad9a6cede66c3d33ea91846113a118933107024fabefb5cdfdb8d6159058d4fd3e962d29a205fc637df976a156582e48e60e7b WHIRLPOOL c62713b4d1e52190ba07d06e604b672244efbbe76d95b29565487035a4e77956b348daa59355011c80bfae0860435844285a60c76b9714c5c4fdeb77f6f1f4b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTVMinAAoJEOSiRoyO7jvo2JkP/i5M8JEem1HmglSYTDPxF7KH
+y2ezQQVjLyKNZ9VWbZxz1qIZw0klO3rf5ra8bQuYJLSyg0cVGgHRZ/1sWkyMB1hJ
+Qpn8cRtqEO4e2D07Y4YPvkXHyLGUPTWpS5arRamLa2auGjC9J4623JgZ1iK5dqL4
+38K74wa745WxrFqPRMDUvKkn78K3XJjjTD6FgWByKFpP0F3Zt4SEt8gzqkgRm7lg
+06rlm1nUsnR9EUEfm0kGxReSTf2WGJTSXDhcXWRoCl7nMXUccY2/SsxZlqSy5uqr
+WDZwG0Lp3tG3b8RQOmiO8IuQm0OHnE4P4qW/zBLFlCLGKXHGIqiHrZOESF9ho6lE
+DmTTcP+pQY9fhyJRKA5ax9F+Yr2UDOADDmKFd+OIbgmeBHDAKzAuTOIn62chWcsF
+Hu4sW3OFJDpIP4bHOlbZsBmN9TweH11S2NL/uLZNuHUtv+SWSapX9C5wJKkHW81D
+9fS3xOtYh0xo+KGR7sY5R4YppZjEFDGY/l1D2Te2QP6vH6yaFikrKrIH/XyJ2Pw0
+HTRbamjSij3DVa1ygwqTylKe14y5Px96WaGH/9FdVQQ4yv4yd6kLkcr9hZAPGgYi
+L1rvTheqD8iKzA47Vlx2xLMevfEglBS8gz+V7Tr2IiqTZ1LG+R4HaBK02RhuhE6g
+lefdhY03nVwM1CqGngBf
+=Qx2x
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index 10e9bd880479..000000000000
--- a/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-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.12.05.ebuild b/dev-util/suse-build/suse-build-2013.12.05.ebuild
deleted file mode 100644
index 4daabfbb6fbc..000000000000
--- a/dev-util/suse-build/suse-build-2013.12.05.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.12.05.ebuild,v 1.2 2014/02/25 12:49:00 scarabeus 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-2014.02.20.ebuild b/dev-util/suse-build/suse-build-2014.02.20.ebuild
index 89bd8706b119..3b95d9d2cff5 100644
--- a/dev-util/suse-build/suse-build-2014.02.20.ebuild
+++ b/dev-util/suse-build/suse-build-2014.02.20.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2014.02.20.ebuild,v 1.2 2014/04/21 07:23:40 scarabeus Exp $
EAPI=5
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="symlink"
[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
virtual/perl-Digest-MD5