Apply Debian patch wrt bug #142597.

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

3 files changed, 30 insertions, 54 deletions

diff --git a/www-apps/sitebar/Manifest b/www-apps/sitebar/Manifest
index 7f8cb51f5f3e..72dcaf1b1de7 100644
--- a/www-apps/sitebar/Manifest
+++ b/www-apps/sitebar/Manifest
@@ -1,31 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 022a72ecc2551f944af20433fa219bc2 ChangeLog 1546
-RMD160 b1076912da1351fb51116d79bc27afd061cf3575 ChangeLog 1546
-SHA256 5e5dfce2bee1316592bdcd24932e48a34bed21d7371996017b4d37d1dd47d374 ChangeLog 1546
-MD5 9df936a7a723323cd696b92c6197af32 files/digest-sitebar-3.2.6 244
-RMD160 ac12307cfc39093fb65bb7ff07fd56f2420e2fc4 files/digest-sitebar-3.2.6 244
-SHA256 b3d5d374c878a7d6b6be8336414d4b724931e548293b0469cc2b61ff8fa5b51c files/digest-sitebar-3.2.6 244
-MD5 d156d8985f6ccbc63d3ab6233c12c24e files/digest-sitebar-3.3.8 244
-RMD160 84086e2707b39ac086d4021c96ff642c2b8f2928 files/digest-sitebar-3.3.8 244
-SHA256 542b6a71bcbd6b3839ee58711ee5fe7976af81e7966628afc9463862e24fc9b8 files/digest-sitebar-3.3.8 244
+AUX debian.patch 466 RMD160 26c14f4fa345439a37bec93b1da24d559ddbad7c SHA1 b2836f81c63de8f74a671721bd195c4bd4da9e20 SHA256 06c0fe3370694ca687d6950b4083f78f84a71cc7f64c45b76bb71b1058eff20c
+MD5 40ed52945a963483b942cc110d92fdd2 files/debian.patch 466
+RMD160 26c14f4fa345439a37bec93b1da24d559ddbad7c files/debian.patch 466
+SHA256 06c0fe3370694ca687d6950b4083f78f84a71cc7f64c45b76bb71b1058eff20c files/debian.patch 466
+AUX postinstall-en.txt 93 RMD160 3f11f795c908c2d344a8bdfb8302807a52754167 SHA1 0733c26b3fe36ea8eb46f671a3c242815ec96898 SHA256 281af23fe8b57b34c44c47bb1d25a5c6ab1e6926386e4cab12ff615bba772831
 MD5 bdd0317fff7e2cccecc51d7d97cd8dc7 files/postinstall-en.txt 93
 RMD160 3f11f795c908c2d344a8bdfb8302807a52754167 files/postinstall-en.txt 93
 SHA256 281af23fe8b57b34c44c47bb1d25a5c6ab1e6926386e4cab12ff615bba772831 files/postinstall-en.txt 93
-MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
-SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata.xml 161
+DIST SiteBar-3.2.6.tar.bz2 252480 RMD160 8d35d943ddc548f69351771836854d60a3234d10 SHA1 e432d377fae1e07e87723f6ec494e98d8d3d0d97 SHA256 82943e0c189c75ba8548b99891b26ef84f9c19d8c54cd0346b3b57fb7209dc3c
+DIST SiteBar-3.3.8.tar.bz2 525327 RMD160 62887901b0444435e88baf19678ecba8b4ad0058 SHA1 097e10ea4b2129349b2ce9dea81bd585cdb331bd SHA256 d25c492c6165564a8e4268627c86777dfc0428683c355235fb0d82866aca7fa3
+EBUILD sitebar-3.2.6.ebuild 841 RMD160 38bd8323df0b420cb736b561e53d9aeca6aa154f SHA1 1c695062ce86e9493bd823dece706291704049c9 SHA256 251260187d312c40e1fdd95c9ea8bb9badae63ca9b9827252c517213b5f26162
 MD5 e5ff6b38f58910b1a158919cc8ab3601 sitebar-3.2.6.ebuild 841
 RMD160 38bd8323df0b420cb736b561e53d9aeca6aa154f sitebar-3.2.6.ebuild 841
 SHA256 251260187d312c40e1fdd95c9ea8bb9badae63ca9b9827252c517213b5f26162 sitebar-3.2.6.ebuild 841
-MD5 222fdfb2411c9eefd5a12149c966ddad sitebar-3.3.8.ebuild 909
-RMD160 33cf10ec708239fb8cf682fcee562135fa799f07 sitebar-3.3.8.ebuild 909
-SHA256 03e1dd3abdf45ca9f90d7b451c1362172e1da9171a4094d50bf425a43a393836 sitebar-3.3.8.ebuild 909
+EBUILD sitebar-3.3.8-r1.ebuild 1031 RMD160 a8f34999f8868f0d7d49271cf93b166daed683e7 SHA1 a2e67d1cf10d6fc162ac69d4304ba68f02a81f46 SHA256 ab697b0675b31dc544237ae4fec6a2729c91391dd1e4e900b3121bfc2b9c1c39
+MD5 c59a961bd9ed3fe1da85c50d6cec2c3d sitebar-3.3.8-r1.ebuild 1031
+RMD160 a8f34999f8868f0d7d49271cf93b166daed683e7 sitebar-3.3.8-r1.ebuild 1031
+SHA256 ab697b0675b31dc544237ae4fec6a2729c91391dd1e4e900b3121bfc2b9c1c39 sitebar-3.3.8-r1.ebuild 1031
+MISC ChangeLog 1736 RMD160 2ebafdfc770cc89bcf1948a87161ec599dc22fe8 SHA1 c8aceefa908042bd2292a6c9262776981a00055d SHA256 5ec1c96ceb724ec2f112bf7818cbc4e9b85d9a1a86462128edfe37f36be4ab3b
+MD5 5792fc5588c9e816d387db022c5149eb ChangeLog 1736
+RMD160 2ebafdfc770cc89bcf1948a87161ec599dc22fe8 ChangeLog 1736
+SHA256 5ec1c96ceb724ec2f112bf7818cbc4e9b85d9a1a86462128edfe37f36be4ab3b ChangeLog 1736
+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 9df936a7a723323cd696b92c6197af32 files/digest-sitebar-3.2.6 244
+RMD160 ac12307cfc39093fb65bb7ff07fd56f2420e2fc4 files/digest-sitebar-3.2.6 244
+SHA256 b3d5d374c878a7d6b6be8336414d4b724931e548293b0469cc2b61ff8fa5b51c files/digest-sitebar-3.2.6 244
+MD5 d156d8985f6ccbc63d3ab6233c12c24e files/digest-sitebar-3.3.8-r1 244
+RMD160 84086e2707b39ac086d4021c96ff642c2b8f2928 files/digest-sitebar-3.3.8-r1 244
+SHA256 542b6a71bcbd6b3839ee58711ee5fe7976af81e7966628afc9463862e24fc9b8 files/digest-sitebar-3.3.8-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEL/TKEzitwsaoONoRAlmYAJsEFQ/Dv2allZ7n8R8ISc60BQc4gwCfR7rM
-CirmSlit31ch4xNAg5z+sFU=
-=DbTM
+iD8DBQFE5JJlEzitwsaoONoRArxeAJ9dPiOZs9U3YKqJ16tL/Mh0Tfh5WQCfdzqD
+qc3Hx4YPi6d7G4B4SUYgJzY=
+=F5Qe
 -----END PGP SIGNATURE-----
diff --git a/www-apps/sitebar/files/digest-sitebar-3.3.8 b/www-apps/sitebar/files/digest-sitebar-3.3.8
deleted file mode 100644
index fc4df3df7b56..000000000000
--- a/www-apps/sitebar/files/digest-sitebar-3.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 612b808777160ce33d46ad603072b155 SiteBar-3.3.8.tar.bz2 525327
-RMD160 62887901b0444435e88baf19678ecba8b4ad0058 SiteBar-3.3.8.tar.bz2 525327
-SHA256 d25c492c6165564a8e4268627c86777dfc0428683c355235fb0d82866aca7fa3 SiteBar-3.3.8.tar.bz2 525327
diff --git a/www-apps/sitebar/sitebar-3.3.8.ebuild b/www-apps/sitebar/sitebar-3.3.8.ebuild
deleted file mode 100644
index 5095122ee214..000000000000
--- a/www-apps/sitebar/sitebar-3.3.8.ebuild
+++ /dev/null
@@ -1,32 +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/sitebar/sitebar-3.3.8.ebuild,v 1.1 2006/04/02 15:58:55 rl03 Exp $
-
-inherit webapp
-
-DESCRIPTION="The Bookmark Server for Personal and Team Use"
-HOMEPAGE="http://sitebar.sourceforge.net/"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="mysql"
-MY_PN=${PN/sitebar/SiteBar}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2"
-
-DEPEND="net-www/apache
-		virtual/php
-		mysql? ( >=dev-db/mysql-3.23 )"
-LICENSE="GPL-2"
-
-src_install() {
-	webapp_src_preinst
-	dodoc readme.txt doc/history.txt doc/install.txt doc/troubleshooting.txt
-	cp -R . ${D}/${MY_HTDOCSDIR}
-	rm -rf ${D}/${MY_HTDOCSDIR}/doc ${D}/${MY_HTDOCSDIR}/readme.txt
-
-	webapp_serverowned ${MY_HTDOCSDIR}/inc
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}