Version bump; bug #145518, bug #145516.

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

3 files changed, 15 insertions, 68 deletions

diff --git a/www-apps/mambo/Manifest b/www-apps/mambo/Manifest
index 904cb484d7d3..a78633f86482 100644
--- a/www-apps/mambo/Manifest
+++ b/www-apps/mambo/Manifest
@@ -5,27 +5,26 @@ AUX postinstall-en.txt 991 RMD160 6030d6f513a42ea02454c1d922a042f0de0fd63c SHA1
 MD5 3601661ea6b8a216f15131f63bc24388 files/postinstall-en.txt 991
 RMD160 6030d6f513a42ea02454c1d922a042f0de0fd63c files/postinstall-en.txt 991
 SHA256 1e10cf8e67825d49baeeae9180d6a1defd020c5d1fd7eae3bef4eef50e8b6e7e files/postinstall-en.txt 991
-DIST Mambov454_Security_Patch1.tar.gz 3135 RMD160 7f15c5a674e7a3eb6d975cd6542d2ca259ab8db8 SHA1 d33fcb430b9e133387ee6db4821854cc365c4361 SHA256 6a2c582173efaa5d47665eff009b0e65488fa69e8ac1d90a6a218a2a13bbcfa4
-DIST mambov4.5.4.tar.gz 1911335 RMD160 c25d39ba00d78078dd28eb824e6808d8e76995f0 SHA1 0889d043ce89f37b64b170739f6ae81d58378978 SHA256 4845095dce71fc82e5df7c8ba9743e494aefab40672c8507978b6d4b76f9bd9b
-EBUILD mambo-4.5.4-r1.ebuild 1222 RMD160 b976bc4bcb8004113c7f50df713c81eb4eb02c1e SHA1 bb4e11dca1c40a453750e9ce53e93bee5b11bd37 SHA256 e75a2513ff13b48f57a2de0628e2c66a0b7a7f4e33404dba63a2558874060d76
-MD5 4c3c9ba43992ca97ba275a6712b43bc3 mambo-4.5.4-r1.ebuild 1222
-RMD160 b976bc4bcb8004113c7f50df713c81eb4eb02c1e mambo-4.5.4-r1.ebuild 1222
-SHA256 e75a2513ff13b48f57a2de0628e2c66a0b7a7f4e33404dba63a2558874060d76 mambo-4.5.4-r1.ebuild 1222
-MISC ChangeLog 3684 RMD160 1f9430fadb217279d5bcce112bed560f9d5eee24 SHA1 98b8daf949f7a824b3ac964f9aba06e2df321d97 SHA256 f7431134120eb5f5a1ab2d411b09855391ec9d31ac54ad56a07081a1500a696a
-MD5 436a6afc24dc47301a8c2ce7c437849e ChangeLog 3684
-RMD160 1f9430fadb217279d5bcce112bed560f9d5eee24 ChangeLog 3684
-SHA256 f7431134120eb5f5a1ab2d411b09855391ec9d31ac54ad56a07081a1500a696a ChangeLog 3684
+DIST Mambov4.5.4_wSP2.tar.gz 1872234 RMD160 37e9dacbb9e32f1e2577e9634487356c9e487921 SHA1 0dfe5a2679e13f393e1f29baf304ee9e370cdf05 SHA256 175a178998ad641c755ed9c4b42dc97e326cc3c61eee2e8c28f72a473d6465d7
+EBUILD mambo-4.5.4-r2.ebuild 1187 RMD160 2091a4aadb27dc5cca584c94a9da435ee0d06006 SHA1 6191aa7d3d1e23aef7ad68edfa7347eab02f5350 SHA256 adbfaecc8a88ce2c50daf44c93858946b9d9fd8880cceaa7520bc9bd23b3a8c4
+MD5 241afa032e6ffb4975914f22c7625dcf mambo-4.5.4-r2.ebuild 1187
+RMD160 2091a4aadb27dc5cca584c94a9da435ee0d06006 mambo-4.5.4-r2.ebuild 1187
+SHA256 adbfaecc8a88ce2c50daf44c93858946b9d9fd8880cceaa7520bc9bd23b3a8c4 mambo-4.5.4-r2.ebuild 1187
+MISC ChangeLog 3854 RMD160 8b02378e6e994ad37ff4597568864618fabac265 SHA1 9089ca8c34fef354580c164ee6e5ba73bc00cc87 SHA256 0e75e48e5a7912c0c3e9d4aed8465ccf200a5563785cd04ece2c705d2fa4e675
+MD5 8cbd8b78d6e40cea0948b60081bb524f ChangeLog 3854
+RMD160 8b02378e6e994ad37ff4597568864618fabac265 ChangeLog 3854
+SHA256 0e75e48e5a7912c0c3e9d4aed8465ccf200a5563785cd04ece2c705d2fa4e675 ChangeLog 3854
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata.xml 161
-MD5 998c8e1531000866005a36a1be32cf80 files/digest-mambo-4.5.4-r1 509
-RMD160 f6c1726c1bed5667ac57e41e251552cc2ec88be9 files/digest-mambo-4.5.4-r1 509
-SHA256 36f26901400a90ff06e19a446cc8a8d7e59d8a501e29257d18be17d88217e10d files/digest-mambo-4.5.4-r1 509
+MD5 160398f7d88ebfc72f765d6d3ade305b files/digest-mambo-4.5.4-r2 253
+RMD160 052b4f450516f6acea9f50570d49eb03480375fc files/digest-mambo-4.5.4-r2 253
+SHA256 9e2d6ece652a22826072437c522830c4ba99dd1a8d123def94907212decbb41c files/digest-mambo-4.5.4-r2 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmGRbEzitwsaoONoRAgW/AKCW5ENYjUbxJ3cHG6/4Ssh5z/B6TACgp2Pv
-iVnQ1JjTiOVnZLyH0/PMglQ=
-=Ud3v
+iD8DBQFFBi6XEzitwsaoONoRAgcjAKCXDCVkhVjAM63lueCCm+nJ4dMf0ACffRgV
+PWOdUybQ4PY2gMUj5110ZX0=
+=D3pD
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mambo/files/digest-mambo-4.5.4-r1 b/www-apps/mambo/files/digest-mambo-4.5.4-r1
deleted file mode 100644
index 79dec8afe574..000000000000
--- a/www-apps/mambo/files/digest-mambo-4.5.4-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bda97ff4f32b72efc79b5f9c23c64545 Mambov454_Security_Patch1.tar.gz 3135
-RMD160 7f15c5a674e7a3eb6d975cd6542d2ca259ab8db8 Mambov454_Security_Patch1.tar.gz 3135
-SHA256 6a2c582173efaa5d47665eff009b0e65488fa69e8ac1d90a6a218a2a13bbcfa4 Mambov454_Security_Patch1.tar.gz 3135
-MD5 5e475aa284c05bcae4b3966ca47f9d35 mambov4.5.4.tar.gz 1911335
-RMD160 c25d39ba00d78078dd28eb824e6808d8e76995f0 mambov4.5.4.tar.gz 1911335
-SHA256 4845095dce71fc82e5df7c8ba9743e494aefab40672c8507978b6d4b76f9bd9b mambov4.5.4.tar.gz 1911335
diff --git a/www-apps/mambo/mambo-4.5.4-r1.ebuild b/www-apps/mambo/mambo-4.5.4-r1.ebuild
deleted file mode 100644
index f22e833c4a98..000000000000
--- a/www-apps/mambo/mambo-4.5.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.4-r1.ebuild,v 1.1 2006/06/20 21:17:18 rl03 Exp $
-
-inherit webapp depend.php
-
-MY_PN="${PN/m/M}"
-DESCRIPTION="Mambo is yet another CMS"
-HOMEPAGE="http://www.mamboserver.com/"
-SRC_URI="http://mamboxchange.com/frs/download.php/7877/${PN}v${PV}.tar.gz
-http://mamboxchange.com/frs/download.php/7967/Mambov454_Security_Patch1.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-S=${WORKDIR}
-
-IUSE="mysql"
-
-RDEPEND="mysql? ( dev-db/mysql )
-	virtual/httpd-php
-	net-www/apache"
-
-pkg_setup () {
-	webapp_pkg_setup
-	require_php_with_use mysql zlib
-}
-
-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.php INSTALL.php README
-
-	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
-}