Fix for #297590

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

diff --git a/app-benchmarks/sysbench/ChangeLog b/app-benchmarks/sysbench/ChangeLog
index da4cae14198fb9a397e48654532d8574de46f3f8..2c16decbe7e40385e2a1de95f22285a42b00e6f5 100644 (file)
--- a/app-benchmarks/sysbench/ChangeLog
+++ b/app-benchmarks/sysbench/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/sysbench
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/sysbench/ChangeLog,v 1.4 2011/08/27 09:07:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/sysbench/ChangeLog,v 1.5 2011/12/27 05:08:40 patrick Exp $
+
+*sysbench-0.4.12-r1 (27 Dec 2011)
+
+  27 Dec 2011; Patrick Lauer <patrick@gentoo.org> +sysbench-0.4.12-r1.ebuild,
+  -sysbench-0.4.12.ebuild:
+  Fix for #297590
 
 *sysbench-0.4.12 (27 Aug 2011)
 

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 9dc5a655547ea8c4272eae6e81252a783685bb4f..8db812be6e0669a545efce1addbf0a6effc14029 100644 (file)
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,6 +1,6 @@
 DIST sysbench-0.4.10.tar.gz 461461 RMD160 cde3a45d77a8f49e44222473e4e0fd34a3b377ff SHA1 caa47cb64123d6f5c8a013fa5bdd7e897ac95ce3 SHA256 c14bfe69f24042b06ff8281debac333e66c30371d1914bb27dac51b672a6a5a3
 DIST sysbench-0.4.12.tar.gz 421932 RMD160 b77c8bf31d84f075ec69ef3972afb8baed02e6bc SHA1 3f346e8b29b738711546970b027bbb7359d4672a SHA256 83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e
 EBUILD sysbench-0.4.10.ebuild 779 RMD160 df285591fb0d2363ac68a7c9bc239a5d86d097c5 SHA1 02f758bd347709a56f10409eef101eb8e611d1c8 SHA256 8d613f28fc14aea8516662b2acc67503d42e75d9d4ee355c82a46ba85b6b737d
-EBUILD sysbench-0.4.12.ebuild 843 RMD160 237088898f493d05112fda03473244f884a8440b SHA1 4d9da347412fdda6259db0ceb7a447822537c82d SHA256 dcaa68539c3f73116ae567eb50f411cdfced68703c9b4f5068db88fbc7ecfacc
-MISC ChangeLog 813 RMD160 7430b7c0cca493a6a1eb3beac3f0c64fa7ad7b71 SHA1 ef3780a21e746618ee3614757fbd25c6df3464f7 SHA256 75bcde69a4f30f42766b3869e98f0bcc9187684b28a92e2c002bebf7f5c5ba3b
+EBUILD sysbench-0.4.12-r1.ebuild 992 RMD160 8b6dccb43363540750a49f120585bdc1677b96e1 SHA1 46a495e4fca3aeb80197a2a918fbed5c620f7ee7 SHA256 89d82d2a24591b251feac8b3aa7f03b7d05417f89d6765b936aa39a6dd04597b
+MISC ChangeLog 972 RMD160 f8cb4e8da00d5f4b1a563c096cf534bc9dfeda90 SHA1 4850b41b8da9a870a2ea9a0284d5b7431bb80248 SHA256 79c965a069ed59a19268e2da531a9b6498ad7e26e0919cb6ad4cfbd915cd735b
 MISC metadata.xml 226 RMD160 e8df85a0a764652a93742876f039e3e22086bd6a SHA1 f6d195abfc1a102b1a770637b5d650c0cc3b67a1 SHA256 97cfac0eb215110debb14c7ab3ca90d4d39a16be4bafdd616887719786af44ab

diff --git a/app-benchmarks/sysbench/sysbench-0.4.12.ebuild b/app-benchmarks/sysbench/sysbench-0.4.12-r1.ebuild
similarity index 79%
rename from app-benchmarks/sysbench/sysbench-0.4.12.ebuild
rename to app-benchmarks/sysbench/sysbench-0.4.12-r1.ebuild
index 553be1c99352b75e38d2c04b51554492080b15e0..5b26ce269ee24fd34bee2101c0d31d143c002250 100644 (file)
--- a/app-benchmarks/sysbench/sysbench-0.4.12.ebuild
+++ b/app-benchmarks/sysbench/sysbench-0.4.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/sysbench/sysbench-0.4.12.ebuild,v 1.1 2011/08/27 09:07:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/sysbench/sysbench-0.4.12-r1.ebuild,v 1.1 2011/12/27 05:08:40 patrick Exp $
 
 EAPI="2"
 
@@ -19,8 +19,13 @@ DEPEND="mysql? ( virtual/mysql )
        aio? ( dev-libs/libaio )"
 RDEPEND="${DEPEND}"
 
-src_configure() {
+src_prepare() {
+       # fix for bug #297590
+       sed -e 's/SUBDIRS \= doc sysbench/SUBDIRS \= sysbench/' -i Makefile.am || die "sed of makefile failed"
        eautoreconf
+}
+
+src_configure() {
        if ! use aio; then my_econf="--disable-aio"; fi
        econf $(use_with mysql mysql /usr) $my_econf || die "econf failed"
 }