Version bump, removed old versions

(Portage version: 2.0.53)

10 files changed, 20 insertions, 240 deletions

diff --git a/www-apps/mambo/ChangeLog b/www-apps/mambo/ChangeLog
index 159ca7ee8938..00159dbb4315 100644
--- a/www-apps/mambo/ChangeLog
+++ b/www-apps/mambo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/mambo
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.20 2005/12/02 23:51:09 rl03 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.21 2006/01/03 15:47:01 rl03 Exp $
+
+*mambo-4.5.3h (03 Jan 2006)
+
+  03 Jan 2006; Renat Lumpau <rl03@gentoo.org>
+  -files/mambo-4.5.2.3-globals_overwrite.patch, -mambo-4.5.2.3.ebuild,
+  -mambo-4.5.2.3-r1.ebuild, -mambo-4.5.3-r1.ebuild, +mambo-4.5.3h.ebuild:
+  Version bump, removed old versions
 
 *mambo-4.5.3-r1 (02 Dec 2005)
 
diff --git a/www-apps/mambo/Manifest b/www-apps/mambo/Manifest
index 49149498468d..564099fe73d6 100644
--- a/www-apps/mambo/Manifest
+++ b/www-apps/mambo/Manifest
@@ -1,20 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 833ddb4f175a688b0893107e846b608d mambo-4.5.2.3.ebuild 2891
-MD5 3a4fe61a2ddf7b07cbdce52f3f67566a mambo-4.5.2.3-r1.ebuild 2990
-MD5 2cc984b7cbec4855fd41be3fdb06e6b9 mambo-4.5.3-r1.ebuild 2899
 MD5 690dd8b3de7aa0887d88a96d0d3bee60 ChangeLog 2929
-MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 3d99cf82feda374b93fb14a227f3d37f files/mambo-4.5.2.3-globals_overwrite.patch 683
+MD5 4f977dccd3fdccf46f8d5c441e547975 files/digest-mambo-4.5.3h 65
 MD5 3601661ea6b8a216f15131f63bc24388 files/postinstall-en.txt 991
-MD5 6c941a8ae21f670067d3ce092d91b9cc files/digest-mambo-4.5.2.3-r1 73
-MD5 6c941a8ae21f670067d3ce092d91b9cc files/digest-mambo-4.5.2.3 73
-MD5 3d30349f2e762ae2d6d794016bced8da files/digest-mambo-4.5.3-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDkN34EzitwsaoONoRAtgQAJ4wUcaHHBHNTrrGquphwGUL0T8H7QCgzvcO
-J/txA4GjUb6Uz/mnYbwhWh8=
-=yZTr
------END PGP SIGNATURE-----
+MD5 bbdf3ce95fbbb9202dec6e1289f3d218 mambo-4.5.3h.ebuild 2881
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
diff --git a/www-apps/mambo/files/digest-mambo-4.5.2.3 b/www-apps/mambo/files/digest-mambo-4.5.2.3
deleted file mode 100644
index 2d9a21f68786..000000000000
--- a/www-apps/mambo/files/digest-mambo-4.5.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f4f934bc26ceed05137a23a1dcf8a54 mamboV4.5.2.3-Stable.tar.gz 1561319
diff --git a/www-apps/mambo/files/digest-mambo-4.5.2.3-r1 b/www-apps/mambo/files/digest-mambo-4.5.2.3-r1
deleted file mode 100644
index 2d9a21f68786..000000000000
--- a/www-apps/mambo/files/digest-mambo-4.5.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f4f934bc26ceed05137a23a1dcf8a54 mamboV4.5.2.3-Stable.tar.gz 1561319
diff --git a/www-apps/mambo/files/digest-mambo-4.5.3-r1 b/www-apps/mambo/files/digest-mambo-4.5.3-r1
deleted file mode 100644
index 69bb0257b884..000000000000
--- a/www-apps/mambo/files/digest-mambo-4.5.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36ab764ff539517f6c624cc5e097246f MamboV4.5.3.tar.gz 1470852
diff --git a/www-apps/mambo/files/digest-mambo-4.5.3h b/www-apps/mambo/files/digest-mambo-4.5.3h
new file mode 100644
index 000000000000..54c2b9f20a36
--- /dev/null
+++ b/www-apps/mambo/files/digest-mambo-4.5.3h
@@ -0,0 +1 @@
+MD5 69c27a55792741fd1307f0e5941480db MamboV4.5.3h.tar.gz 3896181
diff --git a/www-apps/mambo/files/mambo-4.5.2.3-globals_overwrite.patch b/www-apps/mambo/files/mambo-4.5.2.3-globals_overwrite.patch
deleted file mode 100644
index c4df9686d4ef..000000000000
--- a/www-apps/mambo/files/mambo-4.5.2.3-globals_overwrite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- globals.php	2005-06-01 23:24:00.000000000 -0400
-+++ globals.php	2005-11-19 01:10:28.000000000 -0500
-@@ -30,10 +30,14 @@
- 	while(list($key,$value)=each($_SERVER)) $GLOBALS[$key]=$value;
- 	while(list($key,$value)=@each($_SESSION)) $GLOBALS[$key]=$value;
- 	foreach($_FILES as $key => $value){
--		$GLOBALS[$key]=$_FILES[$key]['tmp_name'];
--		foreach($value as $ext => $value2){
--			$key2 = $key . '_' . $ext;
--			$GLOBALS[$key2] = $value2;
-+		if(!isset($GLOBALS[$key])) {
-+			$GLOBALS[$key]=$_FILES[$key]['tmp_name'];
-+			foreach($value as $ext => $value2){
-+				$key2 = $key . '_' . $ext;
-+				if(!isset($GLOBALS[$key2])) {
-+					$GLOBALS[$key2] = $value2;
-+				}
-+			}
- 		}
- 	}
- }
diff --git a/www-apps/mambo/mambo-4.5.2.3-r1.ebuild b/www-apps/mambo/mambo-4.5.2.3-r1.ebuild
deleted file mode 100644
index 1c2c9ce0112b..000000000000
--- a/www-apps/mambo/mambo-4.5.2.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.2.3-r1.ebuild,v 1.1 2005/11/20 10:41:41 stuart Exp $
-
-inherit webapp eutils
-
-MY_P="${PN/M/m}V${PV}-Stable"
-DESCRIPTION="Mambo is yet another CMS"
-HOMEPAGE="http://www.mamboserver.com/"
-SRC_URI="http://mamboforge.net/frs/download.php/4004/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-S=${WORKDIR}
-
-IUSE=""
-
-RDEPEND="dev-db/mysql
-	virtual/httpd-php
-	net-www/apache"
-DEPEND="app-arch/unzip"
-
-pkg_setup () {
-	webapp_pkg_setup
-	einfo "Please make sure that your PHP is compiled with XML and MySQL support"
-}
-
-src_install () {
-	webapp_src_preinst
-	local files="administrator/backups administrator/components components
-	images images/banners images/stories mambots mambots/content mambots/search
-	media language administrator/modules administrator/templates cache modules
-	templates"
-
-	dodoc CHANGELOG INSTALL
-
-	cp -R [^d]* ${D}/${MY_HTDOCSDIR}
-
-	cd "${D}/${MY_HTDOCSDIR}"
-	epatch "${FILESDIR}/${PN}-4.5.2.3-globals_overwrite.patch"
-
-	for file in ${files}; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-	done
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst () {
-	einfo "Now run \"emerge --config =${PF}\""
-	einfo "to setup the database"
-	einfo "Note that db and dbuser need to be present prior to running db setup"
-	webapp_pkg_postinst
-}
-
-pkg_config() {
-	# default values for db stuff
-	D_DB="mambo"
-	D_HOST="localhost"
-	D_USER="mambo"
-
-	# do we want to start mysqld?
-	/etc/init.d/mysql restart || die "mysql needs to be running"
-
-	echo -n "mysql db name [${D_DB}]: "; read MY_DB
-	[[ -z ${MY_DB} ]] && MY_DB=${D_DB}
-
-	echo -n "mysql db host [${D_HOST}]: "; read MY_HOST
-	[[ -z ${MY_HOST} ]] && MY_HOST=${D_HOST}
-
-	echo -n "mysql dbuser name [${D_USER}]: "; read MY_USER
-	[[ -z ${MY_USER} ]] && MY_USER=${D_USER}
-
-	echo -n "mysql dbuser password: "; read mypwd
-	[[ -z ${mypwd} ]] && die "Error: no dbuser password"
-
-	# privileges
-	echo -n "Please enter login info for user who has grant privileges on ${MY_HOST} [$USER]: "; read adminuser
-	[[ -z ${adminuser} ]] && adminuser="$USER"
-	if [ "${MY_HOST}" != "localhost" ]; then
-		echo -n "Client address (at db side) [$(hostname -f)]: "; read clientaddr
-		[[ -z ${clientaddr} ]] && clientaddr="$(hostname -f)"
-	fi
-	# this will be default for localhost
-	[[ -z ${clientaddr} ]] && clientaddr="${MY_HOST}"
-
-	# if $MY_HOST == localhost, don't specify -h argument, so local socket can be used.
-	host=${MY_HOST/localhost}
-	mysqladmin -u ${adminuser} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
-	mysql -u "${adminuser}" "${host:+-h ${host}}" -p \
-		-e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES
-		ON ${MY_DB}.* TO '${MY_USER}'@'${clientaddr}' IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || die "Error initializing database. Please grant permissions manually."
-}
diff --git a/www-apps/mambo/mambo-4.5.2.3.ebuild b/www-apps/mambo/mambo-4.5.2.3.ebuild
deleted file mode 100644
index d8e1a6aa5990..000000000000
--- a/www-apps/mambo/mambo-4.5.2.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.2.3.ebuild,v 1.5 2005/10/23 15:04:30 rl03 Exp $
-
-inherit webapp eutils
-
-MY_P="${PN/M/m}V${PV}-Stable"
-DESCRIPTION="Mambo is yet another CMS"
-HOMEPAGE="http://www.mamboserver.com/"
-SRC_URI="http://mamboforge.net/frs/download.php/4004/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-S=${WORKDIR}
-
-IUSE=""
-
-RDEPEND="dev-db/mysql
-	virtual/php
-	net-www/apache"
-DEPEND="app-arch/unzip"
-
-pkg_setup () {
-	webapp_pkg_setup
-	einfo "Please make sure that your PHP is compiled with XML and MySQL support"
-}
-
-src_install () {
-	webapp_src_preinst
-	local files="administrator/backups administrator/components components
-	images images/banners images/stories mambots mambots/content mambots/search
-	media language administrator/modules administrator/templates cache modules
-	templates"
-
-	dodoc CHANGELOG INSTALL
-
-	cp -R [^d]* ${D}/${MY_HTDOCSDIR}
-
-	for file in ${files}; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-	done
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst () {
-	einfo "Now run \"emerge --config =${PF}\""
-	einfo "to setup the database"
-	einfo "Note that db and dbuser need to be present prior to running db setup"
-	webapp_pkg_postinst
-}
-
-pkg_config() {
-	# default values for db stuff
-	D_DB="mambo"
-	D_HOST="localhost"
-	D_USER="mambo"
-
-	# do we want to start mysqld?
-	/etc/init.d/mysql restart || die "mysql needs to be running"
-
-	echo -n "mysql db name [${D_DB}]: "; read MY_DB
-	[[ -z ${MY_DB} ]] && MY_DB=${D_DB}
-
-	echo -n "mysql db host [${D_HOST}]: "; read MY_HOST
-	[[ -z ${MY_HOST} ]] && MY_HOST=${D_HOST}
-
-	echo -n "mysql dbuser name [${D_USER}]: "; read MY_USER
-	[[ -z ${MY_USER} ]] && MY_USER=${D_USER}
-
-	echo -n "mysql dbuser password: "; read mypwd
-	[[ -z ${mypwd} ]] && die "Error: no dbuser password"
-
-	# privileges
-	echo -n "Please enter login info for user who has grant privileges on ${MY_HOST} [$USER]: "; read adminuser
-	[[ -z ${adminuser} ]] && adminuser="$USER"
-	if [ "${MY_HOST}" != "localhost" ]; then
-		echo -n "Client address (at db side) [$(hostname -f)]: "; read clientaddr
-		[[ -z ${clientaddr} ]] && clientaddr="$(hostname -f)"
-	fi
-	# this will be default for localhost
-	[[ -z ${clientaddr} ]] && clientaddr="${MY_HOST}"
-
-	# if $MY_HOST == localhost, don't specify -h argument, so local socket can be used.
-	host=${MY_HOST/localhost}
-	mysqladmin -u ${adminuser} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
-	mysql -u "${adminuser}" "${host:+-h ${host}}" -p \
-		-e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES
-		ON ${MY_DB}.* TO '${MY_USER}'@'${clientaddr}' IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || die "Error initializing database. Please grant permissions manually."
-}
diff --git a/www-apps/mambo/mambo-4.5.3-r1.ebuild b/www-apps/mambo/mambo-4.5.3h.ebuild
index d4c76b0ccb9c..c36dcb6917b8 100644
--- a/www-apps/mambo/mambo-4.5.3-r1.ebuild
+++ b/www-apps/mambo/mambo-4.5.3h.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.3-r1.ebuild,v 1.1 2005/12/02 23:51:09 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.3h.ebuild,v 1.1 2006/01/03 15:47:01 rl03 Exp $
 
 inherit webapp
 
 MY_P="${PN/m/M}V${PV}"
 DESCRIPTION="Mambo is yet another CMS"
 HOMEPAGE="http://www.mamboserver.com/"
-SRC_URI="http://mamboforge.net/frs/download.php/7670/${MY_P}.tar.gz"
+SRC_URI="http://mamboforge.net/frs/download.php/7819/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 S=${WORKDIR}
 
-IUSE=""
+IUSE="mysql"
 
-RDEPEND="dev-db/mysql
+RDEPEND="mysql? ( dev-db/mysql )
 	virtual/httpd-php
 	net-www/apache"
 DEPEND="app-arch/unzip"
@@ -47,8 +47,9 @@ src_install () {
 
 pkg_postinst () {
 	einfo "Now run \"emerge --config =${PF}\""
-	einfo "to setup the database"
+	einfo "if you wish to setup a local database"
 	einfo "Note that db and dbuser need to be present prior to running db setup"
+	einfo "and your MySQL needs to be running"
 	webapp_pkg_postinst
 }
 
@@ -58,9 +59,6 @@ pkg_config() {
 	D_HOST="localhost"
 	D_USER="mambo"
 
-	# do we want to start mysqld?
-	/etc/init.d/mysql restart || die "mysql needs to be running"
-
 	echo -n "mysql db name [${D_DB}]: "; read MY_DB
 	[[ -z ${MY_DB} ]] && MY_DB=${D_DB}