From c36c4f0ea49b21aa11380561d1af6871332996c0 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sat, 2 Dec 2006 21:03:12 +0000 Subject: [PATCH] Fix bug #155905, cleanup ebuilds. Package-Manager: portage-2.1.2_rc2-r2 --- dev-db/mysql-super-smack/ChangeLog | 6 +++- dev-db/mysql-super-smack/Manifest | 24 +++++++-------- .../mysql-super-smack-1.2.ebuild | 30 +++++++++++-------- .../mysql-super-smack-1.3.ebuild | 30 +++++++++++-------- 4 files changed, 53 insertions(+), 37 deletions(-) diff --git a/dev-db/mysql-super-smack/ChangeLog b/dev-db/mysql-super-smack/ChangeLog index 480553f9d436..9620e37ffe16 100644 --- a/dev-db/mysql-super-smack/ChangeLog +++ b/dev-db/mysql-super-smack/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql-super-smack # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/ChangeLog,v 1.8 2006/11/23 20:02:01 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/ChangeLog,v 1.9 2006/12/02 21:03:12 chtekk Exp $ + + 02 Dec 2006; Luca Longinotti + mysql-super-smack-1.2.ebuild, mysql-super-smack-1.3.ebuild: + Fix bug #155905, cleanup ebuilds. 23 Nov 2006; Francesco Riosa mysql-super-smack-1.2.ebuild, mysql-super-smack-1.3.ebuild: diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest index 86c4547c53f2..3967d6437a36 100644 --- a/dev-db/mysql-super-smack/Manifest +++ b/dev-db/mysql-super-smack/Manifest @@ -8,18 +8,18 @@ RMD160 d944432c9fadc500d9780f05b0b1f6ea5dc0576f files/mysql-super-smack-1.3.amd6 SHA256 c88a75a35851433689bfa2f2922bd389344643a3ad6bcafa1ce3f4a80e4ef564 files/mysql-super-smack-1.3.amd64.patch 702 DIST super-smack-1.2.tar.gz 99478 RMD160 846d3a9cc5bce41978cdfa2016ff339bd6eb7d90 SHA1 a9ed79c090b3cb1f152ff92e5565c9fb3862cfe2 SHA256 52c2b83de7b2043d35c9687d9975c9476a0cb0ef200fd7c02ed68e3a3d025ae3 DIST super-smack-1.3.tar.gz 155375 RMD160 bea82e7b26070f0e6ba0ea2ffb187cc374f6204e SHA1 1db165de4f82c9646e31f393ece56f57670de34d SHA256 969d40e772faa8580f8e8f2dfa2a381fbadbd79fc0c94304347d594dba2a9bd9 -EBUILD mysql-super-smack-1.2.ebuild 1275 RMD160 ccc7e53ce5e150cfb89f53c426aa2259fe5329cf SHA1 aba7f7067deb7391bf8de2de18418f39a1fb1eb6 SHA256 c681019bdfdccbafcec51020b1e3c5a42a7e45e41b4adeba3f463cada21c81e2 -MD5 d27cdb201c01c0ae1cfe69eed0b4bc40 mysql-super-smack-1.2.ebuild 1275 -RMD160 ccc7e53ce5e150cfb89f53c426aa2259fe5329cf mysql-super-smack-1.2.ebuild 1275 -SHA256 c681019bdfdccbafcec51020b1e3c5a42a7e45e41b4adeba3f463cada21c81e2 mysql-super-smack-1.2.ebuild 1275 -EBUILD mysql-super-smack-1.3.ebuild 1347 RMD160 fb7773621a9795bdbd388832d8a89c12175e00c2 SHA1 8630f80245c6a0d1bc563038b1bec396ee327291 SHA256 8379fecba4a17297dc440e2366684147398c46223a742fbb7d2547d7e794d47f -MD5 64ca247b7646b5c2550478c587a99551 mysql-super-smack-1.3.ebuild 1347 -RMD160 fb7773621a9795bdbd388832d8a89c12175e00c2 mysql-super-smack-1.3.ebuild 1347 -SHA256 8379fecba4a17297dc440e2366684147398c46223a742fbb7d2547d7e794d47f mysql-super-smack-1.3.ebuild 1347 -MISC ChangeLog 1238 RMD160 470adbe37d09d64b2ef8fa76612bd4a64f929a18 SHA1 8fdb8f67e0c8dbc635d95328c0f0cc0fcacbdb1b SHA256 6980ba60216a827d920ebbfe42c23f32a556e2491277f9958a660c81503d3714 -MD5 231ef04f041f2305709540e42c95ebdd ChangeLog 1238 -RMD160 470adbe37d09d64b2ef8fa76612bd4a64f929a18 ChangeLog 1238 -SHA256 6980ba60216a827d920ebbfe42c23f32a556e2491277f9958a660c81503d3714 ChangeLog 1238 +EBUILD mysql-super-smack-1.2.ebuild 1446 RMD160 eac590442d0fb5f3acc30df96dc74fb9a8514fef SHA1 3894e95d6f500f193ed23a89935a091f3a2f1720 SHA256 e37b7e58a5a0cec9c6e86bb05ae410bc4737450223a3763487dc777d5a7f21b1 +MD5 d81cd0c186af0c00e3a1085643c0488d mysql-super-smack-1.2.ebuild 1446 +RMD160 eac590442d0fb5f3acc30df96dc74fb9a8514fef mysql-super-smack-1.2.ebuild 1446 +SHA256 e37b7e58a5a0cec9c6e86bb05ae410bc4737450223a3763487dc777d5a7f21b1 mysql-super-smack-1.2.ebuild 1446 +EBUILD mysql-super-smack-1.3.ebuild 1492 RMD160 040a9cbc7a98b553dea315501f53dd0e79ccd928 SHA1 447d6ec1e484590507e4f3536567840eaa4fd76c SHA256 9d9f0188e60ded809acb011b0e13c599a912c42965d9a9cf76614c1ccaa632f8 +MD5 4dae67d8bf80bf1eb5351dcaa159e6f9 mysql-super-smack-1.3.ebuild 1492 +RMD160 040a9cbc7a98b553dea315501f53dd0e79ccd928 mysql-super-smack-1.3.ebuild 1492 +SHA256 9d9f0188e60ded809acb011b0e13c599a912c42965d9a9cf76614c1ccaa632f8 mysql-super-smack-1.3.ebuild 1492 +MISC ChangeLog 1390 RMD160 7e0937c8ea487fb365b2cbbb9d2f1d819100d14d SHA1 b446ed4535033d1e7128f36854843e14e688b285 SHA256 8aaffdc4082db494b7abb8a1d844aab74b2fcb17f9a0bebc385619435e5c3ab5 +MD5 abc0ffa62ed05298f54b19a220129f55 ChangeLog 1390 +RMD160 7e0937c8ea487fb365b2cbbb9d2f1d819100d14d ChangeLog 1390 +SHA256 8aaffdc4082db494b7abb8a1d844aab74b2fcb17f9a0bebc385619435e5c3ab5 ChangeLog 1390 MISC metadata.xml 225 RMD160 74879797e03923649e534769cbd28d301a84623e SHA1 7d843700f0bf221e490ffba7d31c2361a1ea8394 SHA256 9072914e1f255004795621cc128734730b730ffaabda8ca955d781a0e0398b13 MD5 62ae293ebc3602342f798f1b3b044eba metadata.xml 225 RMD160 74879797e03923649e534769cbd28d301a84623e metadata.xml 225 diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild index c5fd2c61e53f..30a89a4ab95d 100644 --- a/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild +++ b/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild,v 1.6 2006/11/23 20:02:01 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild,v 1.7 2006/12/02 21:03:12 chtekk Exp $ -inherit eutils +WANT_AUTOMAKE="1.4" + +inherit eutils autotools MY_PN="super-smack" MY_P="${MY_PN}-${PV}" -DESCRIPTION="MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL" +DESCRIPTION="MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL." HOMEPAGE="http://jeremy.zawodny.com/mysql/${MY_PN}/" SRC_URI="http://jeremy.zawodny.com/mysql/${MY_PN}/${MY_P}.tar.gz" @@ -16,9 +18,10 @@ KEYWORDS="x86" IUSE="mysql postgres" DEPEND="mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql )" + postgres? ( dev-db/postgresql )" +RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" pkg_setup() { use !mysql && use !postgres && die "You need to use at least one of USE=mysql or USE=postgres for benchmarking!" @@ -26,22 +29,25 @@ pkg_setup() { src_unpack() { unpack ${A} - epatch ${FILESDIR}/${P}.destdir.patch - cd ${S} - automake + cd "${S}" + + epatch "${FILESDIR}/${P}.destdir.patch" + + autotools_set_versions + automake || die "automake failed" } src_compile() { - local myconf + local myconf="" use mysql && myconf="${myconf} --with-mysql" use postgres && myconf="${myconf} --with-pgsql" myconf="${myconf} --with-datadir=/var/tmp/${MY_PN}" myconf="${myconf} --with-smacks-dir=/usr/share/${MY_PN}" - econf ${myconf} || die - emake || die + econf ${myconf} || die "econf failed" + emake || die "emake failed" } src_install() { - make DESTDIR=${D} install || die + emake DESTDIR="${D}" install || die "emake install failed" dodoc CHANGES INSTALL MANUAL README TUTORIAL } diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3.ebuild index 2dd8d2b3a45e..2b0cbe82d0bf 100644 --- a/dev-db/mysql-super-smack/mysql-super-smack-1.3.ebuild +++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3.ebuild,v 1.4 2006/11/23 20:02:01 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3.ebuild,v 1.5 2006/12/02 21:03:12 chtekk Exp $ -inherit eutils +WANT_AUTOMAKE="1.4" + +inherit eutils autotools MY_PN="super-smack" MY_P="${MY_PN}-${PV}" -DESCRIPTION="MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL" +DESCRIPTION="MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL." HOMEPAGE="http://vegan.net/tony/supersmack/" SRC_URI="http://vegan.net/tony/supersmack/${MY_P}.tar.gz" @@ -16,7 +18,8 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="mysql postgres" DEPEND="mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql )" + postgres? ( dev-db/postgresql )" +RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" @@ -26,23 +29,26 @@ pkg_setup() { src_unpack() { unpack ${A} - EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.2.destdir.patch - cd ${S} - epatch ${FILESDIR}/${PN}-1.3.amd64.patch - automake + cd "${S}" + + epatch "${FILESDIR}/${PN}-1.2.destdir.patch" + epatch "${FILESDIR}/${PN}-1.3.amd64.patch" + + autotools_set_versions + automake || die "automake failed" } src_compile() { - local myconf + local myconf="" use mysql && myconf="${myconf} --with-mysql" use postgres && myconf="${myconf} --with-pgsql" myconf="${myconf} --with-datadir=/var/tmp/${MY_PN}" myconf="${myconf} --with-smacks-dir=/usr/share/${MY_PN}" - econf ${myconf} || die - emake || die + econf ${myconf} || die "econf failed" + emake || die "emake failed" } src_install() { - make DESTDIR=${D} install || die + emake DESTDIR="${D}" install || die "emake install failed" dodoc CHANGES INSTALL MANUAL README TUTORIAL } -- 2.26.2