dev-db/mongodb: Remove 1.0 branch since users will upgrade on sync anyway. Masking the 1.2 branch isn't preferable either since it's considered stable

svn path=/sunrise/; revision=9739

5 files changed, 7 insertions, 115 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index d525896cf..5c4a7cfcd 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2009; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
+  -mongodb-1.0.1.ebuild, -files/modify-post-strip-1.0.patch,
+  -files/modify-testing-1.0.patch:
+  Remove 1.0 branch since users will upgrade on sync anyway. Masking the 1.2
+  branch isn't preferable either since it's considered stable
+
   15 Dec 2009; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
   mongodb-1.0.1.ebuild, +files/modify-post-strip-1.0.patch,
   +files/modify-testing-1.0.patch, -files/modify-post-strip.patch,
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 755c1e7b8..53e827be8 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,12 +1,8 @@
-AUX modify-post-strip-1.0.patch 456 RMD160 262692df49f375ff6eab566a34e646b4f9eb0306 SHA1 9800d4b197efd8bf36de05ca06e58c847b979243 SHA256 1ee26bf6f9091dd99f573e4bd12d9341dcbdcebe74edb0ae25caafba6deb1572
 AUX modify-post-strip-1.2.patch 456 RMD160 dae0e77c3e6e0bb867b972586a907b438b2f9de8 SHA1 5021957e1165b897e3ec74d1d8b2d4d81f66809e SHA256 85f6c2eacdacc316c7ebb5ce373da7593daf32b097435c1deb2516a600f69ca3
-AUX modify-testing-1.0.patch 1276 RMD160 a4cfdad3b9c6102d28f487ad009aabef581eabeb SHA1 bebd414e2d8af94b44dbcb81d92a7b1274cd5c86 SHA256 1e0ae2e54f22a28f6462ac37284dd0b8b4776e82373c4d25959c012998a445ce
 AUX modify-testing-1.2.patch 1480 RMD160 3a9f0814141d55fccf41d45d9d376fefad273322 SHA1 18fb11b60afdbc489788ff9cb315700067a99807 SHA256 40646380a5ef57a3d92a7db9b606932f681432beb3054d885e7c5778f533470d
 AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
 AUX mongodb.initd 1024 RMD160 cd38a158302270c75d2e12360f6d7fab259aca66 SHA1 f841675161b318ee7647e028df38b03ae6e4c647 SHA256 a9136dbcbd9626d80988c2f46c73af6b2f23bc4af52c9f68d33d2feaa1649dcb
-DIST mongodb-1.0.1.tar.gz 3922059 RMD160 81344f9c16351a9a00d87d015b5cb6f80d07dddd SHA1 5d008486ef6188fcbac650e5b481c15806e38eb7 SHA256 509f34c847e6d63f898e0337717fa78f2389e82ed6a6bb5f47df70bd2cfb1af2
 DIST mongodb-1.2.0.tar.gz 3875764 RMD160 6d756dddc3f91817df107dde3f70241938451f4a SHA1 812d8a14f590ff0b0af0170de9ccfe13283630b4 SHA256 6384307eb86130f8902aeecc495720e2462a7a3abac1c870e8ff09efca1ce0a0
-EBUILD mongodb-1.0.1.ebuild 1310 RMD160 1afd003b15e375e481fe6378c15f2c82d682ead4 SHA1 d42c29951526e8c10f7f8b7664d673164ce74463 SHA256 2e9ffbfb86c5f8d0a36175b836f36373c4957bc759661deebfc86dfe059df600
 EBUILD mongodb-1.2.0.ebuild 1733 RMD160 f7c0a5fb98da13823dee1f4d091c19a08e494f70 SHA1 8330914debe0230be01f7d95d9d95f37f6f6fda7 SHA256 a81b2f1ec237c4b0c763ff83b7c0fea039334c3fd8d35bac960886f18a58a437
-MISC ChangeLog 2282 RMD160 3ab9d2dbb2a48d2d1c3feefdb0780e2d4cdb5cd5 SHA1 6aa5a0eb060e90bd9874eb1965ae2c6916dc5d5f SHA256 c4922cac8babe0b2029f91c159840ee18b9bb51082a54d9ddc07211ceaad2e87
+MISC ChangeLog 2585 RMD160 3710db1c20fa779b2d7035608158a5270c1d140b SHA1 8f973b1368610fb3242a809bd2124c9c17a676dc SHA256 230bb18721d761fbfd0c176cc5b5d9f0196980413363da4cb282de148b7bacf6
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-db/mongodb/files/modify-post-strip-1.0.patch b/dev-db/mongodb/files/modify-post-strip-1.0.patch
deleted file mode 100644
index 02876f9ff..000000000
--- a/dev-db/mongodb/files/modify-post-strip-1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SConstruct	2009-07-29 20:49:21.000000000 +0200
-+++ SConstruct.new	2009-07-31 10:24:00.000000000 +0200
-@@ -1179,8 +1179,6 @@
-     fullInstallName = installDir + "/bin/" + name
- 
-     allBinaries += [ name ]
--    if solaris or linux:
--        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/modify-testing-1.0.patch b/dev-db/mongodb/files/modify-testing-1.0.patch
deleted file mode 100644
index dc9259235..000000000
--- a/dev-db/mongodb/files/modify-testing-1.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -u SConstruct.old SConstruct
---- SConstruct.old	2009-06-10 12:47:25.000000000 +0200
-+++ SConstruct	2009-06-10 12:47:42.000000000 +0200
-@@ -811,9 +811,11 @@
-             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()
-@@ -890,7 +892,7 @@
-     mongodForTestsPort = "40000"
-     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 -u dbtests/dbtests.cpp.old dbtests/dbtests.cpp
---- dbtests/dbtests.cpp.old	2009-06-10 13:10:43.000000000 +0200
-+++ dbtests/dbtests.cpp	2009-06-09 15:37:04.000000000 +0200
-@@ -35,7 +35,7 @@
- namespace mongo {
-     extern const char* dbpath;
- } // namespace mongo
--string dbpathSpec = "/tmp/unittest/";
-+string dbpathSpec = "testdir/tmp/unittest/";
- 
- Suite::~Suite() {
-     DBDirectClient c;
-
diff --git a/dev-db/mongodb/mongodb-1.0.1.ebuild b/dev-db/mongodb/mongodb-1.0.1.ebuild
deleted file mode 100644
index d60e3927a..000000000
--- a/dev-db/mongodb/mongodb-1.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils versionator
-
-MY_PATCHVER=$(get_version_component_range 1-2)
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://github.com/mongodb/mongo/tarball/r${PV} -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/spidermonkey
-	dev-libs/boost
-	dev-libs/libpcre"
-
-DEPEND="${RDEPEND}
-	>=dev-util/scons-1.2.0-r1
-	test? ( dev-libs/unittest )"
-
-S=${WORKDIR}/${PN}-mongo-e316c78
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/modify-*-${MY_PATCHVER}.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"
-
-	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"
-}