From 5fcb71f5c268859a66ae9b0a628bfe2c84f15a58 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Mon, 8 Mar 2010 07:05:30 +0000 Subject: [PATCH] Version bump, add 1.3.x branch ebuild, remove postinst bits, use correct upstream tarball. Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- dev-db/mongodb/ChangeLog | 11 +++- dev-db/mongodb/Manifest | 14 +++-- .../files/mongodb-1.3-modify-post-strip.patch | 12 ++++ .../files/mongodb-1.3-modify-testing.patch | 45 ++++++++++++++ dev-db/mongodb/mongodb-1.2.4.ebuild | 61 +++++++++++++++++++ dev-db/mongodb/mongodb-1.3.3.ebuild | 61 +++++++++++++++++++ 6 files changed, 199 insertions(+), 5 deletions(-) create mode 100644 dev-db/mongodb/files/mongodb-1.3-modify-post-strip.patch create mode 100644 dev-db/mongodb/files/mongodb-1.3-modify-testing.patch create mode 100644 dev-db/mongodb/mongodb-1.2.4.ebuild create mode 100644 dev-db/mongodb/mongodb-1.3.3.ebuild diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index 5fbef23a7f28..c2f50534ac39 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-db/mongodb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.1 2010/03/07 23:39:41 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.2 2010/03/08 07:05:29 ramereth Exp $ + +*mongodb-1.3.3 (08 Mar 2010) +*mongodb-1.2.4 (08 Mar 2010) + + 08 Mar 2010; Lance Albertson +mongodb-1.2.4.ebuild, + +mongodb-1.3.3.ebuild, +files/mongodb-1.3-modify-post-strip.patch, + +files/mongodb-1.3-modify-testing.patch: + Version bump, add 1.3.x branch ebuild, remove postinst bits, use correct + upstream tarball. *mongodb-1.2.2 (07 Mar 2010) diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 1495e5af63fc..4a310ac1f55f 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -3,16 +3,22 @@ Hash: SHA1 AUX mongodb-1.2-modify-post-strip.patch 456 RMD160 dae0e77c3e6e0bb867b972586a907b438b2f9de8 SHA1 5021957e1165b897e3ec74d1d8b2d4d81f66809e SHA256 85f6c2eacdacc316c7ebb5ce373da7593daf32b097435c1deb2516a600f69ca3 AUX mongodb-1.2-modify-testing.patch 1480 RMD160 3a9f0814141d55fccf41d45d9d376fefad273322 SHA1 18fb11b60afdbc489788ff9cb315700067a99807 SHA256 40646380a5ef57a3d92a7db9b606932f681432beb3054d885e7c5778f533470d +AUX mongodb-1.3-modify-post-strip.patch 600 RMD160 bf952ef7d985d31a769d121257ba5f62411e2548 SHA1 a11eb89aaa9e63a0ed1cca1b00dc1525ccc3fafc SHA256 cac8a7f7fc5ffad038e63e9333bffe7eba63f84774aae6c286ffa7084cb5c584 +AUX mongodb-1.3-modify-testing.patch 1721 RMD160 f1f89059be31071c99fa5d041bc5141d21d0031d SHA1 a37c94d83675d41bd9d01581111f315e35e0a17a SHA256 a6955cb4b0afc767fa43c65fd7b0a230fa1e6eadee998a369cd2d7345f7d27fc AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad AUX mongodb.initd 1122 RMD160 126440360297ead030587bd328f040f0bb22e89c SHA1 0e94859933e60a9e75d11abee3d74ea191eeef94 SHA256 aa729ef902bd174039a168b7617046ce9db601917f0d606e1fe41e8cc0fefe12 DIST mongodb-1.2.2.tar.gz 3876370 RMD160 f78d9145e9fa4aff69af872f89548baebc364d3c SHA1 a95c2c419a314c603a189cb7fab393d1c46357b3 SHA256 2c25c3db9bce1d78c36bbba0dde05a0dceb0133eda6036131bf3e8dec59c2148 +DIST mongodb-src-r1.2.4.tar.gz 3879698 RMD160 1d2e9f629cb2af620f0543138773d744817657b2 SHA1 a3d09fea3ac5bde7955520d99fe546e102ac6474 SHA256 8ebeca780d461c9a525230f4ef7321f07753cfebc21f0051be2d430cc99a605d +DIST mongodb-src-r1.3.3.tar.gz 1159357 RMD160 a4814dca399397e9aa6797b04f1fbb14f3edbe24 SHA1 9095a642bc09fe0e3b145faf266037b47f4652f6 SHA256 207c7d85db3b32320e52b5fc2ec19009788a9b332ad71cd339b39c5ffc41c81e EBUILD mongodb-1.2.2.ebuild 1920 RMD160 32da0cf9cb8ac043d2320f8b533de81cab78721e SHA1 d11e28e89bf3f31bb3d0a17c2fe04dae33d4bf8b SHA256 3c61dfe675fe488a68b2cc7a0adf14353284d555884d533d29d22186c07ce599 -MISC ChangeLog 545 RMD160 d649e4fd43c6b703df2e06c5fad97c59458aefcd SHA1 a332fcbcf26a99ae41242a47f64f8ca7b638ca76 SHA256 5b8bab723f9e2606f675a5cf1daa2d4bbb039030674f3b136de82fbee99cf3b7 +EBUILD mongodb-1.2.4.ebuild 1468 RMD160 8b4c0cea708bd4b92182aafda62f5c7d4440f0a2 SHA1 a5ae5c825acf2bf1aaba014c7685a283ebde7630 SHA256 10d1fd69543f14b20f68edad91c7e9444cca20b5b394487fe5fbb4f7e8df4c47 +EBUILD mongodb-1.3.3.ebuild 1468 RMD160 cbab432952235e95487bb40057442044c5d0aca8 SHA1 2cc3a1d5d70d806c363c15f851ecf105f224f6a5 SHA256 10dd6df2f332cb9c7257e6af9b571c5a48c25c4ea6c7b223138e1df5a3c833ed +MISC ChangeLog 888 RMD160 847d67f90eee1aa363b74e634581fb371ed31514 SHA1 b9f4eaf3c5260c170a9caeb3845a0aa39bcb9435 SHA256 2a404c1958428623e664b046fe439b4158e9d2a6d4e7d48ecf5faaf3509109f0 MISC metadata.xml 628 RMD160 e8915a5fd2f27054d32e2ab8e65e00b748b00996 SHA1 cc99b68bb5e305562a69c0b439c4fe9a23716df8 SHA256 35f0587d94487ff4e0de0f6fac0a879aeeb9d0ef86b988fea4264e31d4215539 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iD8DBQFLlDi/QW+hXSf0t0IRAjNmAJ9oFjP9k6CC+ojGDsdIT64Dh/0FSgCeM68K -8GCHmSS2b2k2rno26RFllRI= -=i5a9 +iD8DBQFLlKE8QW+hXSf0t0IRAjSAAKDhQQjCV1w48a/ZDfYi6R94JxesvQCeMzey +BmEUy2qSOwODQaF3kzjJWYs= +=Xiw7 -----END PGP SIGNATURE----- diff --git a/dev-db/mongodb/files/mongodb-1.3-modify-post-strip.patch b/dev-db/mongodb/files/mongodb-1.3-modify-post-strip.patch new file mode 100644 index 000000000000..5795c7e48925 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-1.3-modify-post-strip.patch @@ -0,0 +1,12 @@ +diff -ur mongodb-src-r1.3.3/SConstruct mongodb-src-r1.3.3.new/SConstruct +--- mongodb-src-r1.3.3/SConstruct 2010-03-02 07:37:07.000000000 -0800 ++++ mongodb-src-r1.3.3.new/SConstruct 2010-03-07 22:36:10.000000000 -0800 +@@ -1478,8 +1478,6 @@ + fullInstallName = installDir + "/bin/" + name + + allBinaries += [ name ] +- if (solaris or linux) and (not GetOption("nostrip")): +- e.AddPostAction( inst, e.Action( 'strip ' + fullInstallName ) ) + + if linux and len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "s3dist": + e.AddPostAction( inst , checkGlibc ) diff --git a/dev-db/mongodb/files/mongodb-1.3-modify-testing.patch b/dev-db/mongodb/files/mongodb-1.3-modify-testing.patch new file mode 100644 index 000000000000..b40d59d1459d --- /dev/null +++ b/dev-db/mongodb/files/mongodb-1.3-modify-testing.patch @@ -0,0 +1,45 @@ +diff -ur mongodb-src-r1.3.3/SConstruct mongodb-src-r1.3.3.new/SConstruct +--- mongodb-src-r1.3.3/SConstruct 2010-03-02 07:37:07.000000000 -0800 ++++ mongodb-src-r1.3.3.new/SConstruct 2010-03-07 22:40:02.000000000 -0800 +@@ -1211,15 +1211,17 @@ + Exit( 1 ) + + def ensureTestDirs(): +- ensureDir( "/tmp/unittest/" ) +- ensureDir( "/data/" ) +- ensureDir( "/data/db/" ) ++ ensureDir( "testdir/" ) ++ ensureDir( "testdir/tmp" ) ++ ensureDir( "testdir/tmp/unittest/" ) ++ ensureDir( "testdir/data/" ) ++ ensureDir( "testdir/data/db/" ) + + def testSetup( env , target , source ): + ensureTestDirs() + + if len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "test": +- ensureDir( "/tmp/unittest/" ); ++ ensureDir( "testdir/tmp/unittest/" ); + + addSmoketest( "smoke", [ add_exe( "test" ) ] , [ test[ 0 ].abspath ] ) + addSmoketest( "smokePerf", [ "perftest" ] , [ perftest[ 0 ].abspath ] ) +@@ -1297,7 +1299,7 @@ + mongodForTestsPort = "32000" + import os + ensureTestDirs() +- dirName = "/data/db/sconsTests/" ++ dirName = "testdir/data/db/sconsTests/" + ensureDir( dirName ) + from subprocess import Popen + mongodForTests = Popen( [ mongod[0].abspath, "--port", mongodForTestsPort, "--dbpath", dirName ] ) +diff -ur mongodb-src-r1.3.3/dbtests/dbtests.cpp mongodb-src-r1.3.3.new/dbtests/dbtests.cpp +--- mongodb-src-r1.3.3/dbtests/dbtests.cpp 2010-03-02 07:37:07.000000000 -0800 ++++ mongodb-src-r1.3.3.new/dbtests/dbtests.cpp 2010-03-07 22:40:37.000000000 -0800 +@@ -22,6 +22,6 @@ + #include "dbtests.h" + + int main( int argc, char** argv ) { +- return Suite::run(argc, argv, "/tmp/unittest"); ++ return Suite::run(argc, argv, "testdir/tmp/unittest"); + } + diff --git a/dev-db/mongodb/mongodb-1.2.4.ebuild b/dev-db/mongodb/mongodb-1.2.4.ebuild new file mode 100644 index 000000000000..753a41c28b8e --- /dev/null +++ b/dev-db/mongodb/mongodb-1.2.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.2.4.ebuild,v 1.1 2010/03/08 07:05:29 ramereth Exp $ + +EAPI="2" + +inherit eutils versionator + +MY_PATCHVER=$(get_version_component_range 1-2) +MY_P="${PN}-src-r${PV}" + +DESCRIPTION="A high-performance, open source, schema-free document-oriented database" +HOMEPAGE="http://www.mongodb.org" +SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-lang/spidermonkey[unicode] + dev-libs/boost + dev-libs/libpcre" + +DEPEND="${RDEPEND} + >=dev-util/scons-1.2.0-r1" + +# Must change this on every upgrade +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup mongodb + enewuser mongodb -1 -1 /var/lib/${PN} mongodb +} + +src_prepare() { + epatch "${FILESDIR}"/"${PN}"-"${MY_PATCHVER}"-modify-*.patch +} + +src_compile() { + scons ${MAKEOPTS} all || die "Compile failed" +} + +src_install() { + scons ${MAKEOPTS} install --prefix="${D}"/usr || die "Install failed" + + for x in /var/{lib,log,run}/${PN}; do + dodir "${x}" || die "Install failed" + fowners mongodb:mongodb "${x}" + done + + doman debian/mongo*.1 || die "Install failed" + dodoc README docs/building.md + + newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed" + newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed" +} + +src_test() { + scons ${MAKEOPTS} smoke test || die "Tests failed" +} diff --git a/dev-db/mongodb/mongodb-1.3.3.ebuild b/dev-db/mongodb/mongodb-1.3.3.ebuild new file mode 100644 index 000000000000..5661656f4f3a --- /dev/null +++ b/dev-db/mongodb/mongodb-1.3.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.3.3.ebuild,v 1.1 2010/03/08 07:05:29 ramereth Exp $ + +EAPI="2" + +inherit eutils versionator + +MY_PATCHVER=$(get_version_component_range 1-2) +MY_P="${PN}-src-r${PV}" + +DESCRIPTION="A high-performance, open source, schema-free document-oriented database" +HOMEPAGE="http://www.mongodb.org" +SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-lang/spidermonkey[unicode] + dev-libs/boost + dev-libs/libpcre" + +DEPEND="${RDEPEND} + >=dev-util/scons-1.2.0-r1" + +# Must change this on every upgrade +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup mongodb + enewuser mongodb -1 -1 /var/lib/${PN} mongodb +} + +src_prepare() { + epatch "${FILESDIR}"/"${PN}"-"${MY_PATCHVER}"-modify-*.patch +} + +src_compile() { + scons ${MAKEOPTS} all || die "Compile failed" +} + +src_install() { + scons ${MAKEOPTS} install --prefix="${D}"/usr || die "Install failed" + + for x in /var/{lib,log,run}/${PN}; do + dodir "${x}" || die "Install failed" + fowners mongodb:mongodb "${x}" + done + + doman debian/mongo*.1 || die "Install failed" + dodoc README docs/building.md + + newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed" + newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed" +} + +src_test() { + scons ${MAKEOPTS} smoke test || die "Tests failed" +} -- 2.26.2