Version bump and new init/conf scripts. lots of cool stuff

6 files changed, 24 insertions, 28 deletions

diff --git a/net-www/memcached/Manifest b/net-www/memcached/Manifest
index f4a330259917..bc2febde8f5d 100644
--- a/net-www/memcached/Manifest
+++ b/net-www/memcached/Manifest
@@ -1,7 +1,7 @@
-MD5 08b79f54d404cd3a3b0dd1f83d347bc5 ChangeLog 822
+MD5 47b21b95089795217147ef104818ec7e ChangeLog 1035
 MD5 04404ee5d4cd9d9658c73187ae6bc821 memcached-1.1.8.ebuild 1367
-MD5 04404ee5d4cd9d9658c73187ae6bc821 memcached-1.1.9.ebuild 1367
-MD5 a3c31338ecf5e0cfaba8d2d1c86562b3 files/conf 495
-MD5 770ac0b54ecd8bc46e637cd1fd9adf88 files/init 510
+MD5 99d3f011b1dba952796d01446d655634 memcached-1.1.9.ebuild 1451
+MD5 6e656253a522a5b65b3650c2113d0244 files/conf 537
+MD5 c57575264e537eacd60e047dd1db8d9d files/init 532
 MD5 c560aeb30f4df25c2e62b4538f7af0f6 files/digest-memcached-1.1.9 66
 MD5 4638b3650e11c9c282817bdaad8fedbf files/digest-memcached-1.1.8 66
diff --git a/net-www/memcached/files/conf b/net-www/memcached/files/conf
index 650c2e089c35..16dae480ed55 100644
--- a/net-www/memcached/files/conf
+++ b/net-www/memcached/files/conf
@@ -1,5 +1,5 @@
 # Copyright 2003 Gentoo Technologies, Inc
-# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/files/conf,v 1.2 2003/07/30 01:43:40 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/files/conf,v 1.3 2003/10/09 18:29:25 lisa Exp $
 # memcached config file
 
 MEMCACHED_BINARY="/usr/bin/memcached"
@@ -8,6 +8,9 @@ MEMCACHED_BINARY="/usr/bin/memcached"
 #64MB is default
 MEMUSAGE="64"
 
+#User to run as
+MEMCACHED_RUNAS="nobody"
+
 #Specify maximum number of concurrent connections
 #1024 is default
 MAXCONN="1024"
diff --git a/net-www/memcached/files/digest-memcached-1.1.6 b/net-www/memcached/files/digest-memcached-1.1.6
deleted file mode 100644
index a3f34779d00e..000000000000
--- a/net-www/memcached/files/digest-memcached-1.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e175c78e66b9120aa2c007f2bbacc2b4 memcached-1.1.6.tar.gz 87833
diff --git a/net-www/memcached/files/digest-memcached-1.1.9 b/net-www/memcached/files/digest-memcached-1.1.9
new file mode 100644
index 000000000000..edd56b664f5d
--- /dev/null
+++ b/net-www/memcached/files/digest-memcached-1.1.9
@@ -0,0 +1 @@
+MD5 a91d1d7c200dcceb6babe01763d9e0ff memcached-1.1.9.tar.gz 99843
diff --git a/net-www/memcached/files/init b/net-www/memcached/files/init
index fff693631ab9..b78618bc5350 100644
--- a/net-www/memcached/files/init
+++ b/net-www/memcached/files/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/files/init,v 1.2 2003/07/30 01:43:40 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/files/init,v 1.3 2003/10/09 18:29:25 lisa Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ start() {
 	/sbin/start-stop-daemon --start \
 	        --exec ${MEMCACHED_BINARY} --pidfile /var/run/memcached.pid \
 		-- -d -p ${PORT} -l ${LISTENON} -m ${MEMUSAGE} \
-		-c ${MAXCONN}
+		-c ${MAXCONN} -u ${MEMCACHED_RUNAS}
 	eend $?
 }
 
diff --git a/net-www/memcached/memcached-1.1.6.ebuild b/net-www/memcached/memcached-1.1.9.ebuild
index 2e6e43d1e729..a0452a20e193 100644
--- a/net-www/memcached/memcached-1.1.6.ebuild
+++ b/net-www/memcached/memcached-1.1.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/memcached-1.1.6.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/memcached-1.1.9.ebuild,v 1.1 2003/10/09 18:29:25 lisa Exp $
 
 DESCRIPTION="memcached is a 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/${P}.tar.gz"
+SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 
@@ -14,11 +14,11 @@ SLOT="0"
 
 KEYWORDS="~x86"
 
-IUSE="static perl"
+IUSE="static perl php"
 
 DEPEND=">=dev-libs/libevent-0.6
-	>=dev-libs/judy-20020627
-	perl? ( dev-lang/perl )
+	perl? ( dev-libs/memcached-api-perl )
+	php? ( dev-libs/memcached-api-php )
 "
 
 #RDEPEND=""
@@ -36,15 +36,6 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	dodir /usr/lib/php/memcached
-	insinto /usr/lib/php/memcached
-	doins ${S}/api/php/MemCachedClient.inc.php
-
-	if use perl; then
-		insinto /usr/lib/perl5/vendor_perl
-		doins ${S}/api/perl/MemCachedClient.pm
-	fi
-
 	insinto /etc/conf.d
 	newins "${FILESDIR}/conf" memcached
 
@@ -54,10 +45,12 @@ src_install() {
 
 
 pkg_postinst() {
-	einfo "This package installs two APIs for usage"
-	einfo "/usr/lib/perl5/vendor_perl/MemCachedClient.pm for perl"
-	einfo "/usr/lib/php/memcached/MemCachedClient.inc.php"
-	echo ""
-	ewarn "To use the PHP one you may have to modify your php.ini"
-	ewarn "to include that directory"
+	if ! use php; then
+		ewarn "This package uses a special \"php\" USE flag to include the PHP"
+		ewarn "API. If you emerged this without setting that USE flag, you can"
+		ewarn "still get the API by doing:"
+		einfo "   emerge dev-libs/memcached-api-php"
+		echo
+	fi
+	ewarn "Do not forget to run etc-update, there are new config and init scripts!"
 }