cleanup

8 files changed, 5 insertions, 232 deletions

diff --git a/net-www/horde-kronolith/Manifest b/net-www/horde-kronolith/Manifest
index bbc5fb95433d..606825b5f603 100644
--- a/net-www/horde-kronolith/Manifest
+++ b/net-www/horde-kronolith/Manifest
@@ -1,9 +1,3 @@
 MD5 b8e5ab0b9c709cf440737b7ac3bb6aa4 ChangeLog 856
-MD5 6daeb03a8da1ac3af1661a05d5de3b3d horde-kronolith-1.0-r1.ebuild 1909
-MD5 db832cd7881d5585222a777e4495c35e horde-kronolith-1.0.ebuild 2418
-MD5 b48fd42fadb94c9a806bf6488613b3d4 horde-kronolith-1.1.ebuild 1906
-MD5 0f8e58fbccd000a657ba81b3254f414c horde-kronolith-1.1_rc3.ebuild 1914
-MD5 d24e5173e8082ea39e9ef204c358b572 files/digest-horde-kronolith-1.0 65
-MD5 d24e5173e8082ea39e9ef204c358b572 files/digest-horde-kronolith-1.0-r1 65
+MD5 1756c90cffefe6178e8d08a86c6b1732 horde-kronolith-1.1.ebuild 1934
 MD5 f09bb55eca7a247b6b728c8f88648705 files/digest-horde-kronolith-1.1 65
-MD5 48e8bf39c9476624f12a5a9dec50c5f3 files/digest-horde-kronolith-1.1_rc3 69
diff --git a/net-www/horde-kronolith/files/digest-horde-kronolith-1.0 b/net-www/horde-kronolith/files/digest-horde-kronolith-1.0
deleted file mode 100644
index 963254cbe2fd..000000000000
--- a/net-www/horde-kronolith/files/digest-horde-kronolith-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae94df3b0a44d7349b36e30997b3dfb4 kronolith-1.0.tar.gz 270604
diff --git a/net-www/horde-kronolith/files/digest-horde-kronolith-1.0-r1 b/net-www/horde-kronolith/files/digest-horde-kronolith-1.0-r1
deleted file mode 100644
index 963254cbe2fd..000000000000
--- a/net-www/horde-kronolith/files/digest-horde-kronolith-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae94df3b0a44d7349b36e30997b3dfb4 kronolith-1.0.tar.gz 270604
diff --git a/net-www/horde-kronolith/files/digest-horde-kronolith-1.1_rc3 b/net-www/horde-kronolith/files/digest-horde-kronolith-1.1_rc3
deleted file mode 100644
index 894868caa27a..000000000000
--- a/net-www/horde-kronolith/files/digest-horde-kronolith-1.1_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e7f80c6d8739c505c118d2c1be85418e kronolith-1.1-RC3.tar.gz 397875
diff --git a/net-www/horde-kronolith/horde-kronolith-1.0-r1.ebuild b/net-www/horde-kronolith/horde-kronolith-1.0-r1.ebuild
deleted file mode 100644
index b7ba34374770..000000000000
--- a/net-www/horde-kronolith/horde-kronolith-1.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.0-r1.ebuild,v 1.1 2003/04/08 23:09:08 alron Exp $
-
-DESCRIPTION="Kronolith ${PV} is the Horde calendar application"
-HOMEPAGE="http://www.horde.org"
-P=kronolith-1.0
-SRC_URI="ftp://ftp.horde.org/pub/kronolith/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-DEPEND=""
-RDEPEND=">=net-www/horde-2.2.1"
-IUSE=""
-
-find_http_root() {
-	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
-	if [ -z "${HTTPD_ROOT}" ]; then
-		eerror "HTTPD_ROOT is null! Using defaults."
-		eerror "You probably want to check /etc/passwd"
-		HTTPD_ROOT="/home/httpd/htdocs"
-	fi
-
-	export REGISTRY=${HTTPD_ROOT}/horde/config/registry.php
-	[ -f ${REGISTRY} ] || REGISTRY=${HTTPD_ROOT}/horde/config/registry.php.dist
-}
-
-pkg_setup() {
-	GREPSQL=`grep sql /var/db/pkg/dev-php/mod_php*/USE`
-	GREPLDAP=`grep ldap /var/db/pkg/dev-php/mod_php*/USE`
-	if [ "${GREPSQL}" != "" ] || [ "${GREPLDAP}" != "" ] ; then
-		return 0
-	else
-		eerror "Missing SQL or LDAP support in mod_php !"
-		die "aborting..."
-	fi
-	find_http_root
-	[ -f ${REGISTRY} ] || die "${REGISTRY} not found"
-}
-
-src_compile() {
-	echo "Nothing to compile"
-}
-
-src_install () {
-
-	# detecting apache usergroup
-	GID=`grep apache /etc/group |cut -d: -f3`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	find_http_root
-	dodir ${HTTPD_ROOT}/horde/kronolith
-	cp -r . ${D}/${HTTPD_ROOT}/horde/kronolith
-
-	# protecting files
-	chown -R apache.${GID} ${D}/${HTTPD_ROOT}/horde/kronolith
-	find ${D}/${HTTPD_ROOT}/horde/kronolith/ -type f -exec chmod 0640 {} \;
-	find ${D}/${HTTPD_ROOT}/horde/kronolith/ -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	find_http_root
-	einfo "Please read ${HTTPD_ROOT}/horde/kronolith/docs/INSTALL !"
-}
diff --git a/net-www/horde-kronolith/horde-kronolith-1.0.ebuild b/net-www/horde-kronolith/horde-kronolith-1.0.ebuild
deleted file mode 100644
index 821826335968..000000000000
--- a/net-www/horde-kronolith/horde-kronolith-1.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.0.ebuild,v 1.2 2003/02/13 15:35:02 vapier Exp $
-
-DESCRIPTION="Kronolith ${PV} is the Horde calendar application"
-HOMEPAGE="http://www.horde.org"
-P=kronolith-1.0
-SRC_URI="ftp://ftp.horde.org/pub/kronolith/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-DEPEND=""
-RDEPEND=">=net-www/horde-2.2"
-IUSE=""
-
-find_http_root() {
-	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
-	if [ -z "${HTTPD_ROOT}" ]; then
-		eerror "HTTPD_ROOT is null! Using defaults."
-		eerror "You probably want to check /etc/passwd"
-		HTTPD_ROOT="/home/httpd/htdocs"
-	fi
-
-	export REGISTRY=${HTTPD_ROOT}/horde/config/registry.php
-	[ -f ${REGISTRY} ] || REGISTRY=${HTTPD_ROOT}/horde/config/registry.php.dist
-}
-
-pkg_setup() {
-	GREPSQL=`grep sql /var/db/pkg/dev-php/mod_php*/USE`
-	GREPLDAP=`grep ldap /var/db/pkg/dev-php/mod_php*/USE`
-	if [ "${GREPSQL}" != "" ] || [ "${GREPLDAP}" != "" ] ; then
-		return 0
-	else
-		eerror "Missing SQL or LDAP support in mod_php !"
-		die "aborting..."
-	fi
-	find_http_root
-	[ -f ${REGISTRY} ] || die "${REGISTRY} not found"
-}
-
-src_compile() {
-	echo "Nothing to compile"
-}
-
-src_install () {
-
-	# detecting apache usergroup
-	GID=`grep apache /etc/group |cut -d: -f3`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	find_http_root
-	dodir ${HTTPD_ROOT}/horde/kronolith
-	cp -r . ${D}/${HTTPD_ROOT}/horde/kronolith
-
-	# protecting files
-	chown -R apache.${GID} ${D}/${HTTPD_ROOT}/horde/kronolith
-	find ${D}/${HTTPD_ROOT}/horde/kronolith/ -type f -exec chmod 0640 {} \;
-	find ${D}/${HTTPD_ROOT}/horde/kronolith/ -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	find_http_root
-	# add module in horde
-	sed -e "/^\/\/.*\(\$this->applications\['kronolith'\].*\)/ \
-		{ : next ; N ; /\;/ { s/\/\///g ; b } ; b next }" \
-		< ${REGISTRY} > ${REGISTRY}.temp
-	cp ${REGISTRY}.temp ${REGISTRY}
-	rm ${REGISTRY}.temp
-
-	einfo "Please read ${HTTPD_ROOT}/horde/kronolith/docs/INSTALL !"
-}
-
-pkg_prerm() {
-	find_http_root
-	# rm module from horde
-	sed -e "/\(\$this->applications\['kronolith'\].*\)/ \
-		{ s/\(.*\)/\/\/\1/g; : suite ; N ; /\;/ { s/\n/\n\/\//g ; b } ; \
-		b suite }" \
-		< ${REGISTRY} > ${REGISTRY}.temp
-	cp ${REGISTRY}.temp ${REGISTRY}
-	rm ${REGISTRY}.temp
-}
diff --git a/net-www/horde-kronolith/horde-kronolith-1.1.ebuild b/net-www/horde-kronolith/horde-kronolith-1.1.ebuild
index a98e8cab0778..dc151d138f1f 100644
--- a/net-www/horde-kronolith/horde-kronolith-1.1.ebuild
+++ b/net-www/horde-kronolith/horde-kronolith-1.1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.1.ebuild,v 1.1 2003/05/12 18:39:34 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.1.ebuild,v 1.2 2003/09/11 19:34:51 mholzer Exp $
 
 DESCRIPTION="Kronolith ${PV} is the Horde calendar application"
 HOMEPAGE="http://www.horde.org"
-P=kronolith-1.1
-SRC_URI="ftp://ftp.horde.org/pub/kronolith/${P}.tar.gz"
+MY_P=${P/horde-/}
+SRC_URI="ftp://ftp.horde.org/pub/kronolith/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.1"
 IUSE=""
+S=${WORKDIR}/${MY_P}
 
 find_http_root() {
 	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
diff --git a/net-www/horde-kronolith/horde-kronolith-1.1_rc3.ebuild b/net-www/horde-kronolith/horde-kronolith-1.1_rc3.ebuild
deleted file mode 100644
index af794bd87f34..000000000000
--- a/net-www/horde-kronolith/horde-kronolith-1.1_rc3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.1_rc3.ebuild,v 1.2 2003/04/10 20:01:51 alron Exp $
-
-DESCRIPTION="Kronolith ${PV} is the Horde calendar application"
-HOMEPAGE="http://www.horde.org"
-P=kronolith-1.1
-SRC_URI="ftp://ftp.horde.org/pub/kronolith/${P}-RC3.tar.gz"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-DEPEND=""
-RDEPEND=">=net-www/horde-2.2.1"
-IUSE=""
-
-find_http_root() {
-	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
-	if [ -z "${HTTPD_ROOT}" ]; then
-		eerror "HTTPD_ROOT is null! Using defaults."
-		eerror "You probably want to check /etc/passwd"
-		HTTPD_ROOT="/home/httpd/htdocs"
-	fi
-
-	export REGISTRY=${HTTPD_ROOT}/horde/config/registry.php
-	[ -f ${REGISTRY} ] || REGISTRY=${HTTPD_ROOT}/horde/config/registry.php.dist
-}
-
-pkg_setup() {
-	GREPSQL=`grep sql /var/db/pkg/dev-php/mod_php*/USE`
-	GREPLDAP=`grep ldap /var/db/pkg/dev-php/mod_php*/USE`
-	if [ "${GREPSQL}" != "" ] || [ "${GREPLDAP}" != "" ] ; then
-		return 0
-	else
-		eerror "Missing SQL or LDAP support in mod_php !"
-		die "aborting..."
-	fi
-	find_http_root
-	[ -f ${REGISTRY} ] || die "${REGISTRY} not found"
-}
-
-src_compile() {
-	echo "Nothing to compile"
-}
-
-src_install () {
-
-	# detecting apache usergroup
-	GID=`grep apache /etc/group |cut -d: -f3`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	find_http_root
-	dodir ${HTTPD_ROOT}/horde/kronolith
-	cp -r . ${D}/${HTTPD_ROOT}/horde/kronolith
-
-	# protecting files
-	chown -R apache.${GID} ${D}/${HTTPD_ROOT}/horde/kronolith
-	find ${D}/${HTTPD_ROOT}/horde/kronolith/ -type f -exec chmod 0640 {} \;
-	find ${D}/${HTTPD_ROOT}/horde/kronolith/ -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	find_http_root
-	einfo "Please read ${HTTPD_ROOT}/horde/kronolith/docs/INSTALL !"
-}