The first releases of 1.2.2 suffered from the pidfile bug, so lets ditch them.

Package-Manager: portage-2.1.4_rc10

6 files changed, 9 insertions, 122 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 37b70298aa0c..4d367daa3f73 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/memcached
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.55 2007/12/18 21:47:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.56 2007/12/18 21:53:21 robbat2 Exp $
+
+  18 Dec 2007; Robin H. Johnson <robbat2@gentoo.org>
+  -memcached-1.2.2.ebuild, -memcached-1.2.2-r1.ebuild:
+  The first releases of 1.2.2 suffered from the pidfile bug, so lets ditch them.
 
 *memcached-1.2.4_rc1 (27 Nov 2007)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 917e0208002d..d82aba8be48c 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -85,26 +85,18 @@ EBUILD memcached-1.2.1.ebuild 1625 RMD160 641ba81de88a49a565f7dca525a7e11ce651c7
 MD5 ad7ebc1e40f4ab271ef2d07f38f7f275 memcached-1.2.1.ebuild 1625
 RMD160 641ba81de88a49a565f7dca525a7e11ce651c7c7 memcached-1.2.1.ebuild 1625
 SHA256 cee1baa94aa4f0e094749735bd93e184adb2710898e180aebe107fa9bd5c1887 memcached-1.2.1.ebuild 1625
-EBUILD memcached-1.2.2-r1.ebuild 1541 RMD160 cea8fda7f4eed52c732b7d8e63f2120e696971c9 SHA1 4a4939d2140b4c223bb98bff5aff1d16056c09c5 SHA256 9808abe5165d0ff1865021513d59790144fe8767d3ec04138ad61f236cd8e0fe
-MD5 f6402bb7cf9744ed976ed3706917c360 memcached-1.2.2-r1.ebuild 1541
-RMD160 cea8fda7f4eed52c732b7d8e63f2120e696971c9 memcached-1.2.2-r1.ebuild 1541
-SHA256 9808abe5165d0ff1865021513d59790144fe8767d3ec04138ad61f236cd8e0fe memcached-1.2.2-r1.ebuild 1541
 EBUILD memcached-1.2.2-r2.ebuild 1481 RMD160 30c813264e8f7fe651f35308fcd48b1f02f32477 SHA1 71b2e158fa0b16ff83bb48c4c5f7ad17a40eca3d SHA256 92691537b18512f4bfa86da778d77e82c43bf0b1316c290d9a424fbb31c7f019
 MD5 729c91da476294d21aa2966c68a5d9d2 memcached-1.2.2-r2.ebuild 1481
 RMD160 30c813264e8f7fe651f35308fcd48b1f02f32477 memcached-1.2.2-r2.ebuild 1481
 SHA256 92691537b18512f4bfa86da778d77e82c43bf0b1316c290d9a424fbb31c7f019 memcached-1.2.2-r2.ebuild 1481
-EBUILD memcached-1.2.2.ebuild 1508 RMD160 5f10d9a0403606a35e3af72447d067708a060aa8 SHA1 09af5731e6b3dea598de8e4aca5c8388eab46cb5 SHA256 282e500035aba5745a2bdb22425abd777fc43f2a5d3ea65478a8db07de0a9341
-MD5 5e3834262153336c8a59ba6f8c603410 memcached-1.2.2.ebuild 1508
-RMD160 5f10d9a0403606a35e3af72447d067708a060aa8 memcached-1.2.2.ebuild 1508
-SHA256 282e500035aba5745a2bdb22425abd777fc43f2a5d3ea65478a8db07de0a9341 memcached-1.2.2.ebuild 1508
 EBUILD memcached-1.2.4_rc1.ebuild 1690 RMD160 e42360834f67bd80744c3fe7dcbe2f312e48c052 SHA1 d8fec2dab5e955dc1009b50717438922cb4ba246 SHA256 866a09cc044759d5f0d6a36956858087f1653f1a5b4c7ef63e33e2639484c812
 MD5 d1cd7deb8bb963049e5c24a6a82a14a5 memcached-1.2.4_rc1.ebuild 1690
 RMD160 e42360834f67bd80744c3fe7dcbe2f312e48c052 memcached-1.2.4_rc1.ebuild 1690
 SHA256 866a09cc044759d5f0d6a36956858087f1653f1a5b4c7ef63e33e2639484c812 memcached-1.2.4_rc1.ebuild 1690
-MISC ChangeLog 10696 RMD160 7e665efee05c8a0863caf6cf8d8e4626b612faec SHA1 7416a5c276a7c758f7e000273334c717c101f7f6 SHA256 14d2cb865e4d094b6bc20b5e6c4665ceda47d157e31dcb88d762422815a7dc3d
-MD5 57effacee91adffb866afa8172dfa3fc ChangeLog 10696
-RMD160 7e665efee05c8a0863caf6cf8d8e4626b612faec ChangeLog 10696
-SHA256 14d2cb865e4d094b6bc20b5e6c4665ceda47d157e31dcb88d762422815a7dc3d ChangeLog 10696
+MISC ChangeLog 10886 RMD160 ab4b88aaa18ce2a5f0a29ece3a0c6414bfe1e883 SHA1 c534965c6a440241e25e75306ce93dc9ea150f7b SHA256 c3535cc467388b081722b2037aa7cda2db4492ed0ab107546190f3fe05ee7978
+MD5 4f795ff5521e5236634d15d3749252fb ChangeLog 10886
+RMD160 ab4b88aaa18ce2a5f0a29ece3a0c6414bfe1e883 ChangeLog 10886
+SHA256 c3535cc467388b081722b2037aa7cda2db4492ed0ab107546190f3fe05ee7978 ChangeLog 10886
 MISC metadata.xml 841 RMD160 60a5beb49a85e92147066ead33afb1961bb00eec SHA1 11a620a9e2336f2dcee196b60c4d4e8127ca5c1e SHA256 6ecc5efcf267f183adeac1a372a306042849384a67f86d3543397dcaf62ff64e
 MD5 9df0145d69d668a197badf5fe5d0005c metadata.xml 841
 RMD160 60a5beb49a85e92147066ead33afb1961bb00eec metadata.xml 841
@@ -139,12 +131,6 @@ SHA256 421b6f7d5281d150930d0841cb467ddfeb6374768815147e6c675009fac587aa files/di
 MD5 32583300835b7f2b710706c8ce960359 files/digest-memcached-1.2.1-r1 247
 RMD160 1390b3a0350d188d49327f6df9c02c5a449525d2 files/digest-memcached-1.2.1-r1 247
 SHA256 421b6f7d5281d150930d0841cb467ddfeb6374768815147e6c675009fac587aa files/digest-memcached-1.2.1-r1 247
-MD5 8de9675f77e1d0a81b0200eaa8689140 files/digest-memcached-1.2.2 247
-RMD160 5370d99ce47279fc56a78263d34f748f0286a725 files/digest-memcached-1.2.2 247
-SHA256 3e2057753b27a6e078ddfbe52d78c484c8aa0f3885904647d5e8f640832bfa15 files/digest-memcached-1.2.2 247
-MD5 8de9675f77e1d0a81b0200eaa8689140 files/digest-memcached-1.2.2-r1 247
-RMD160 5370d99ce47279fc56a78263d34f748f0286a725 files/digest-memcached-1.2.2-r1 247
-SHA256 3e2057753b27a6e078ddfbe52d78c484c8aa0f3885904647d5e8f640832bfa15 files/digest-memcached-1.2.2-r1 247
 MD5 8de9675f77e1d0a81b0200eaa8689140 files/digest-memcached-1.2.2-r2 247
 RMD160 5370d99ce47279fc56a78263d34f748f0286a725 files/digest-memcached-1.2.2-r2 247
 SHA256 3e2057753b27a6e078ddfbe52d78c484c8aa0f3885904647d5e8f640832bfa15 files/digest-memcached-1.2.2-r2 247
diff --git a/net-misc/memcached/files/digest-memcached-1.2.2 b/net-misc/memcached/files/digest-memcached-1.2.2
deleted file mode 100644
index 577508393a9d..000000000000
--- a/net-misc/memcached/files/digest-memcached-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a08851f7fa7b15e92ee6320b7a79c321 memcached-1.2.2.tar.gz 166201
-RMD160 78dd094efb9b17a5e80a631690b929b3a4427854 memcached-1.2.2.tar.gz 166201
-SHA256 8dbaedb88b8f9c61b977cf6e670bb3b0f172c357169ccba1c8362230bfdc7cf7 memcached-1.2.2.tar.gz 166201
diff --git a/net-misc/memcached/files/digest-memcached-1.2.2-r1 b/net-misc/memcached/files/digest-memcached-1.2.2-r1
deleted file mode 100644
index 577508393a9d..000000000000
--- a/net-misc/memcached/files/digest-memcached-1.2.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a08851f7fa7b15e92ee6320b7a79c321 memcached-1.2.2.tar.gz 166201
-RMD160 78dd094efb9b17a5e80a631690b929b3a4427854 memcached-1.2.2.tar.gz 166201
-SHA256 8dbaedb88b8f9c61b977cf6e670bb3b0f172c357169ccba1c8362230bfdc7cf7 memcached-1.2.2.tar.gz 166201
diff --git a/net-misc/memcached/memcached-1.2.2-r1.ebuild b/net-misc/memcached/memcached-1.2.2-r1.ebuild
deleted file mode 100644
index 4f505580e5bd..000000000000
--- a/net-misc/memcached/memcached-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.2-r1.ebuild,v 1.2 2007/11/18 15:03:03 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load"
-HOMEPAGE="http://www.danga.com/memcached/"
-SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nptl"
-
-RDEPEND=">=dev-libs/libevent-0.6
-		dev-perl/Cache-Memcached"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.1.13/conf memcached
-	newinitd "${FILESDIR}"/1.1.13/init memcached
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you must create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-misc/memcached/memcached-1.2.2.ebuild b/net-misc/memcached/memcached-1.2.2.ebuild
deleted file mode 100644
index cfbcdfb676e6..000000000000
--- a/net-misc/memcached/memcached-1.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.2.ebuild,v 1.3 2007/11/18 15:03:03 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load"
-HOMEPAGE="http://www.danga.com/memcached/"
-SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nptl"
-
-RDEPEND=">=dev-libs/libevent-0.6
-		dev-perl/Cache-Memcached"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.1.13/conf memcached
-	newinitd "${FILESDIR}"/1.1.13/init memcached
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you must create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}