Patches merged upstream.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 23 insertions, 154 deletions

diff --git a/app-benchmarks/os-autoinst/ChangeLog b/app-benchmarks/os-autoinst/ChangeLog
index 9f6a9370c974..7e85278f5138 100644
--- a/app-benchmarks/os-autoinst/ChangeLog
+++ b/app-benchmarks/os-autoinst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/os-autoinst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/os-autoinst/ChangeLog,v 1.1 2012/03/14 14:30:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/os-autoinst/ChangeLog,v 1.2 2012/04/16 08:17:12 scarabeus Exp $
+
+  16 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0001-use-proper-path-to-share-for-isotovideo.patch,
+  -files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch,
+  os-autoinst-9999.ebuild:
+  Patches merged upstream.
 
 *os-autoinst-9999 (14 Mar 2012)
 
diff --git a/app-benchmarks/os-autoinst/Manifest b/app-benchmarks/os-autoinst/Manifest
index 962c0d922bec..1fd625648bec 100644
--- a/app-benchmarks/os-autoinst/Manifest
+++ b/app-benchmarks/os-autoinst/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0001-use-proper-path-to-share-for-isotovideo.patch 636 RMD160 1129cdd7a352f84408a0b47204f18ceaf727b9ca SHA1 d87c33dc18fe6bbe5c9e81c67aee2402b1870623 SHA256 408c5566946afec859a0ebdf3b50288778e858600802d6e4dcbd1201b899fe2a
-AUX 0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch 3034 RMD160 fed009bedd25c626c756987a504eb364fca66f1d SHA1 e3ce9df860b6759cc0f4e799733d9bf04e7bbed3 SHA256 6d7700a13d8fdd5c96aa8952eb4e8930883d1b8e0d5d88f0e5d604c260c19cb3
-EBUILD os-autoinst-9999.ebuild 854 RMD160 f875acbcb7f84539acb8416ece9890b3b9b93f27 SHA1 02d9c2353d1d10ab73a8397e954fcdae8adaaaf7 SHA256 813ce718977e0ed9fbc109732a3e1c151829836e8aee0744722085f113fb673e
-MISC ChangeLog 551 RMD160 5694f220b1b939c5129cfa9fdbf0b0bf45ec0cde SHA1 56501bc513084690af823aa79272a21b097f965e SHA256 e7ad271eeee7cb988a4e72eef39ec4d84c8fc7327849568876a769922e61905e
+EBUILD os-autoinst-9999.ebuild 698 RMD160 331879c8373aaa1b9879a9cd0132269ef2d0ceef SHA1 f2cade479d4f54ad5e5f62fd7de8d2885df32066 SHA256 35b4748244abd4141dd202a255cd588cb39ffe0fb1ecbfd5add034d3e54ccc51
+MISC ChangeLog 792 RMD160 03c81c6825934cfecee1abeaa8a5e91c4c677bbd SHA1 cb5e8819b568a6e9f9c806176b5c47cd744f368c SHA256 113f5d819df1cf9a37a2aad89e3bf247f36986041ecf6257890f335ddad5df2e
 MISC metadata.xml 227 RMD160 063e20d2b5793ddb7e03fcbb9b74d16e89a7dfd2 SHA1 bde43a2a328561c988deab5db73f616eed135c6a SHA256 d1c336716e28ea3ecb9d4408745155cc2fabd1ea0a185fea4474f344041c0679
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPYKuUAAoJEOSiRoyO7jvoXf4QAKWAi6af1zD8vSvmWApieyNc
-9xe3Z9EO7R2WY3WdQ/K6a58mfYL03+14Y3TtZmNggfBswuE/M3L0/5WzUlyLERTy
-IUw2z53lzW6mR457QYxyaSoIsgSWhrWP8WQZgBIuQsmKEBSLHXK+tBt0lyKENdxv
-vfPl3D3cBFzr8aTSN2h5Us6dDO7sz1MTNTJIwob4W0rnxgMY31iLawO6FnqawnPN
-bL3Nqfo3OEu2X1m72SJRJ42oSCPSIkAV02KRlE0+uz6faXffDrrrmEoxu3Q0hGZZ
-XxN5qlO0vLsxNyMvvnTrJf54WBnWETEl0rpIsAEI2bTy9+oGCks993xJlCPycBI3
-gl53IgjGPj7hu+dheFm+SR68Nk2L5pbdDszBrN41IC2JTN+Ugu+uM4Gq0LrY7elb
-n5vMA6JTc54e4Z28BlPvamr+WQYHUFHbA1QpljkIFgKFWXV84MLUbRS+KSNn3CIn
-t16USD+qxweEcdVkHHZcDqBj6SjKLjjd/xrMyQB449/RqjiRzwGDXv2mwMya47n8
-PXCwO8jfA96YzD3FyKvAtxS7CB9uoNsAwFMGYlQpuShFIWSU0c8BLfLOlSWE2j2j
-3f6cYCJucCvmaPCq+QFwK2oie1UIXPgW1OCkLJo+cGd3vegZzw2mY5ou1+SOHXtn
-DDCgRp0SeRsEFKSDJIWG
-=yB+4
+iQIcBAEBAgAGBQJPi9YOAAoJEOSiRoyO7jvoctIP/R6iZ8dG76Fnqg6mBIYRABy9
+HAzeqC+jS8VY+AHUTeY+d35ncftYTIHYrWRy5eHJRcQtQdVgSkmDkjOUcugQrDH9
+sd+Y9mPvtiuc1mhMvQp951urIFuTUfiMFIIMNxU8ZKmic4thYCFZ8BShTt+gsssq
+WkuwP1HB66vJlGiMbWLNxh2ApJUqOJhI9YZqPCdcqe7KZeqK9JqV2qQVk0hWiKAM
+uVg/9gZWC+fRI9CiEKJVw2ZqwhSNe/PZx5SpNRfRzdAMQi32Qt54crcQzWk4rcPK
+Wu9KYkrHQHd/fwZrpRkeNZzb8qLL64YUrkeNUZ1mqKqOs1TldQ9K0C0vEh1LaJkM
+NUywM4Ykgr1ZPuXSRqvwX0kFVNmUjsgbmFMs+b98b2lBmwTs9+91XrxkGl/3thdu
+av45QXqy2IX+YgJ5sYQign30zq92zNi0KRrbkItsZuLENISIB2FSua67dFSV2J3/
+wCMq5kTdccxdU5mioqA1WIyt+BY7264IDNuF1lSaQa5eVDqyQhVdqBSPkWUk+uAt
+AGyLT3Q2NFjz+cbt6E8yd/qfhgd3jF14IZjr5k558GZmjsfHgoZnRDosj8vZnHfi
+T3Ymf9H0DLOPzM4ASsZ+B2ut/xYoqvdihj9HE5kKtlIr8t999ZDBYoQJHWbdAmDQ
+eI/qeq9VxySg8lN1pkme
+=wbpu
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/os-autoinst/files/0001-use-proper-path-to-share-for-isotovideo.patch b/app-benchmarks/os-autoinst/files/0001-use-proper-path-to-share-for-isotovideo.patch
deleted file mode 100644
index adc93cfd7b68..000000000000
--- a/app-benchmarks/os-autoinst/files/0001-use-proper-path-to-share-for-isotovideo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 227971acbe41735d2f7f21fd9af94de561e43527 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
-Date: Thu, 1 Mar 2012 11:58:06 +0100
-Subject: [PATCH 1/2] use proper path to share for isotovideo.
-
----
- bin/isotovideo.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bin/isotovideo.in b/bin/isotovideo.in
-index 715327d..b399564 100644
---- a/bin/isotovideo.in
-+++ b/bin/isotovideo.in
-@@ -1,3 +1,3 @@
- #!/usr/bin/env sh
--exec_prefix="@prefix@"
--exec "@libdir@/@PACKAGE@/tools/isotovideo"
-+prefix="@prefix@"
-+exec "@datarootdir@/@PACKAGE@/tools/isotovideo"
--- 
-1.7.7
-
diff --git a/app-benchmarks/os-autoinst/files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch b/app-benchmarks/os-autoinst/files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch
deleted file mode 100644
index ef7020025dff..000000000000
--- a/app-benchmarks/os-autoinst/files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 06e7c7acfdc8f5c4d5fa56042d0a8c91214e10a1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
-Date: Mon, 5 Mar 2012 15:36:00 +0100
-Subject: [PATCH 2/2] Use libexecdir and do not depend on runtime deps
-
-Now it matches exactly the spec file behaviour
----
- Makefile.am       |   14 +++++++-------
- bin/isotovideo.in |    4 ++--
- configure.ac      |   21 ---------------------
- 3 files changed, 9 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0f42c27..471f4b5 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,7 +13,7 @@ packagestate_DATA_FOLDERS = \
- 	testimgs \
- 	audio
- 
--pkgdata_DATA = \
-+pkglibexec_DATA = \
- 	backend_qemu.pm \
- 	backend_vbox.pm \
- 	basenoupdate.pm \
-@@ -26,7 +26,7 @@ pkgdata_DATA = \
- 	ppm.pm \
- 	start.pl
- 
--pkdata_FOLDERS = \
-+pkglibexec_FOLDERS = \
- 	consoletest.d \
- 	distri \
- 	tools \
-@@ -40,7 +40,7 @@ pkdata_FOLDERS = \
- bin_SCRIPTS = bin/isotovideo
- 
- EXTRA_DIST = autogen.sh bin/isotovideo.in \
--	$(doc_DATA) $(pkgdata_DATA) $(packagestate_DATA_FOLDERS) $(pkdata_FOLDERS)
-+	$(doc_DATA) $(pkglibexec_DATA) $(packagestate_DATA_FOLDERS) $(pkglibexec_FOLDERS)
- 
- CLEANFILES = $(bin_SCRIPTS)
- 
-@@ -50,16 +50,16 @@ install-data-local:
- 		cp -r $(top_srcdir)/$$i "$(DESTDIR)/$(packagestatedir)" ; \
- 	done
- 	mkdir -p "$(DESTDIR)/$(pkgdatadir)" ; \
--	for i in $(pkdata_FOLDERS) ; do \
--		cp -r $(top_srcdir)/$$i "$(DESTDIR)/$(pkgdatadir)" ; \
-+	for i in $(pkglibexec_FOLDERS) ; do \
-+		cp -r $(top_srcdir)/$$i "$(DESTDIR)/$(pkglibexecdir)" ; \
- 	done
- 
- uninstall-local:
- 	for i in $(packagestate_DATA_FOLDERS) ; do \
- 		rm -rf "$(DESTDIR)/$(packagestatedir)/$$i" ; \
- 	done
--	for i in $(pkdata_FOLDERS) ; do \
--		 rm -rf "$(DESTDIR)/$(pkgdatadir)/$$i" ; \
-+	for i in $(pkglibexec_FOLDERS) ; do \
-+		 rm -rf "$(DESTDIR)/$(pkglibexecdir)/$$i" ; \
- 	done
- 
- dist-hook:
-diff --git a/bin/isotovideo.in b/bin/isotovideo.in
-index b399564..20bb945 100644
---- a/bin/isotovideo.in
-+++ b/bin/isotovideo.in
-@@ -1,3 +1,3 @@
- #!/usr/bin/env sh
--prefix="@prefix@"
--exec "@datarootdir@/@PACKAGE@/tools/isotovideo"
-+exec_prefix="@prefix@"
-+exec "@libexecdir@/@PACKAGE@/tools/isotovideo"
-diff --git a/configure.ac b/configure.ac
-index 4998e89..24400f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,27 +17,6 @@ AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
- AM_SILENT_RULES([yes])
- 
--# ===========================
--# Find required base packages
--# ===========================
--PKG_PROG_PKG_CONFIG([0.24])
--
--# ==================
--# Check dependencies
--# ==================
--AC_CHECK_PROG([KVM],[qemu-kvm],[yes])
--AS_IF([test "x$KVM" != "xyes"], [
--	AC_MSG_ERROR([Please install qemu-kvm before installing.])
--])
--AC_CHECK_PROG([PERL],[perl],[yes])
--AS_IF([test "x$PERL" != "xyes"], [
--	AC_MSG_ERROR([Please install perl before installing.])
--])
--# TODO:
--#  Add checks for Time::HiRes and Algorithm::Line::Bresenham
--
--PKG_CHECK_MODULES([IMAGEMAGICK],[ImageMagick])
--
- AC_CONFIG_FILES([
- 	Makefile
- 	bin/isotovideo
--- 
-1.7.7
-
diff --git a/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild b/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild
index e1cfb761e9e1..a528bd2f1003 100644
--- a/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild
+++ b/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild,v 1.1 2012/03/14 14:30:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild,v 1.2 2012/04/16 08:17:12 scarabeus Exp $
 
 EAPI=4
 
@@ -27,10 +27,6 @@ RDEPEND="
 DEPEND=""
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/0001-use-proper-path-to-share-for-isotovideo.patch" \
-		"${FILESDIR}/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch"
-
 	eautoreconf
 }