Version bump, bug #145979. Add patch to fix linking with --as-needed by

drizzt@gufi.org, bug #144130. Security cleanup, bug #140556.

Package-Manager: portage-2.1.1

3 files changed, 47 insertions, 121 deletions

diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index ce0d7cee0380..041cf9fe1dee 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,11 +1,51 @@
-MD5 d55533c65326aafcf2e6409dc940c2d5 ChangeLog 13482
-MD5 e23614bce2d1d77e7df6952b8f3244ca dillo-0.7.3-r7.ebuild 3061
+AUX dillo-asneeded.patch 1894 RMD160 892d979625bb338802d038c370422c33d9501edb SHA1 c6ac90247a6f344cee5dde70dbc55ad6e449b458 SHA256 36069751fe0fd5ecc9e60b387217a7c30da5000ecadc0379f6b39255d7c5f633
+MD5 c0fe8343a4c0bdc3458eb61a783bfcdb files/dillo-asneeded.patch 1894
+RMD160 892d979625bb338802d038c370422c33d9501edb files/dillo-asneeded.patch 1894
+SHA256 36069751fe0fd5ecc9e60b387217a7c30da5000ecadc0379f6b39255d7c5f633 files/dillo-asneeded.patch 1894
+AUX dillo-format-string-vulnerability.diff 787 RMD160 daae19ee05e691e7cd26b810143582dd84226a7f SHA1 e92ed5a6ac1dd6d8471c7b24e5d10b92c2b232b8 SHA256 2ee975a907eff1824d10ba3773f612298c3310af08295dcf655286055691fa73
+MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
+RMD160 daae19ee05e691e7cd26b810143582dd84226a7f files/dillo-format-string-vulnerability.diff 787
+SHA256 2ee975a907eff1824d10ba3773f612298c3310af08295dcf655286055691fa73 files/dillo-format-string-vulnerability.diff 787
+DIST dillo-0.8.5-i18n-misc-20050620.diff.bz2 244152
+DIST dillo-0.8.5-i18n-misc-20051010.diff.bz2 247058
+DIST dillo-0.8.5-i18n-misc-20060104.diff.bz2 248425
+DIST dillo-0.8.5.tar.bz2 424795
+DIST dillo-0.8.6-i18n-misc-20060625.diff.bz2 258290 RMD160 b158236c62f80d7df1273863ef958704fdd7e340 SHA1 c9aabf6b5c0e4f3d3d963b0471b66724f8e00c20 SHA256 872accdc2828eb564f4e30d9471e0c52ce48d957a196d1671cd3067b7a454de3
+DIST dillo-0.8.6.tar.bz2 441739 RMD160 062cff85b330a5b443ddc81a356e81f930677cbb SHA1 ee03b11ba6b75d3180ca906d8275bd35e8765995 SHA256 47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
+DIST dillo-gentoo-extras-patch4.tar.bz2 98800 RMD160 2c04bf1b7f2763e748e2fc4d6848e0d82f680525 SHA1 7011f67113b1f811d94aa88e5185cbd1daf8bd8d SHA256 25871b318ffc046eebe9be100f5d1027e649b94dd4d3e0bfb36ec6d139cded05
+EBUILD dillo-0.8.5-r1.ebuild 3606 RMD160 eff995642def8cea32f52f6006ba068d5fc03747 SHA1 521e1941b2f86632ec2d419463a5ca2f48c83fb2 SHA256 863c7881b607932e0f05d0aca9bdc7bd0d3ac3a30473c23688318a0b8c5f3e44
 MD5 d59c047c502094e1882c0c09422b385a dillo-0.8.5-r1.ebuild 3606
+RMD160 eff995642def8cea32f52f6006ba068d5fc03747 dillo-0.8.5-r1.ebuild 3606
+SHA256 863c7881b607932e0f05d0aca9bdc7bd0d3ac3a30473c23688318a0b8c5f3e44 dillo-0.8.5-r1.ebuild 3606
+EBUILD dillo-0.8.5-r2.ebuild 3612 RMD160 011755f92841869a1e9a40034b0048040bd42c9f SHA1 b9e087b41c5baf25bf0d4c9ed83fcc141c37af4a SHA256 aa5b10064b572ae9cb2d64a07905d7e8097be134c6aa87d7aef29ad81936923b
 MD5 1909f58b5dde32ddaf2c2fede0c7b8f1 dillo-0.8.5-r2.ebuild 3612
+RMD160 011755f92841869a1e9a40034b0048040bd42c9f dillo-0.8.5-r2.ebuild 3612
+SHA256 aa5b10064b572ae9cb2d64a07905d7e8097be134c6aa87d7aef29ad81936923b dillo-0.8.5-r2.ebuild 3612
+EBUILD dillo-0.8.5-r3.ebuild 3612 RMD160 ccf59c44d276c4470e2104cf2a5e1ac86d834617 SHA1 74a29d699aae08a79ba2ec80093d3a7efa700699 SHA256 07ddf9e2beaa923168cce168332b4f3497d66be157fc2195b2feb67eb76506df
 MD5 fcb743f02194742567f19c69109ca9b2 dillo-0.8.5-r3.ebuild 3612
-MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
-MD5 8114dfcae2f9f3437c043ed6953f219d files/digest-dillo-0.8.5-r1 226
-MD5 b2d1d2280e92c7e86dcfb11fe73eb777 files/digest-dillo-0.8.5-r2 226
-MD5 ba038100788e11d181e9e819b15bcc9a files/digest-dillo-0.8.5-r3 226
-MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
+RMD160 ccf59c44d276c4470e2104cf2a5e1ac86d834617 dillo-0.8.5-r3.ebuild 3612
+SHA256 07ddf9e2beaa923168cce168332b4f3497d66be157fc2195b2feb67eb76506df dillo-0.8.5-r3.ebuild 3612
+EBUILD dillo-0.8.6.ebuild 3688 RMD160 788ac84896e2c9bbd18ac40d7580b0e2916d658f SHA1 49fee10613eb485092fbcab1a355e12eaaf68edc SHA256 ef243f0e245c4b803e6bee8fa86ed4b5b7991644af9a61accd9b38c310602541
+MD5 3358d28190a209ad39943f89c9b6b30e dillo-0.8.6.ebuild 3688
+RMD160 788ac84896e2c9bbd18ac40d7580b0e2916d658f dillo-0.8.6.ebuild 3688
+SHA256 ef243f0e245c4b803e6bee8fa86ed4b5b7991644af9a61accd9b38c310602541 dillo-0.8.6.ebuild 3688
+MISC ChangeLog 13773 RMD160 8a3b54175de2212d05f3ab1959d5edc096e19252 SHA1 b451ee1198427d8a1edab91a47b1c78e72da543f SHA256 a47328a49399c9106900315f73e3711e63ef141c319f4be72b356f008a642db6
+MD5 d70c22b6363d179f623afe62b55d0584 ChangeLog 13773
+RMD160 8a3b54175de2212d05f3ab1959d5edc096e19252 ChangeLog 13773
+SHA256 a47328a49399c9106900315f73e3711e63ef141c319f4be72b356f008a642db6 ChangeLog 13773
+MISC metadata.xml 221 RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f SHA1 58771ce3377eeee2ebf1bb8acdeaa0ba169e9342 SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
+RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f metadata.xml 221
+SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf metadata.xml 221
+MD5 8a9cdc6d29ca7e039bd6fef1fc2dd8c0 files/digest-dillo-0.8.5-r1 428
+RMD160 7972fc38bae8dc91dc459487af5396db7ab53948 files/digest-dillo-0.8.5-r1 428
+SHA256 327feb7b69b2e01f759271d326c53a1a042ff8f23a0cf1ea4eb28c49f4be9e1a files/digest-dillo-0.8.5-r1 428
+MD5 6c6392a67ccf99748a0d6117d216884a files/digest-dillo-0.8.5-r2 428
+RMD160 fbe6165f2fa9de9325580cbf33d8868a4d0c7eed files/digest-dillo-0.8.5-r2 428
+SHA256 a4ace08074a3cf27f876b04a291b260ad10ea4022fa97735ef01dcc29abe2236 files/digest-dillo-0.8.5-r2 428
+MD5 a0b5278f2986a2deb94405bd899d4c86 files/digest-dillo-0.8.5-r3 428
+RMD160 81e24be3a5fb0b62496dfd12b74753d149b47909 files/digest-dillo-0.8.5-r3 428
+SHA256 42daca7617bf5dfc7de096d3bdd894d3b427ee62934919383186edd7d10390fb files/digest-dillo-0.8.5-r3 428
+MD5 97b9877fba1b3a992cecc53da28a3674 files/digest-dillo-0.8.6 816
+RMD160 fc663e293f98bf0b64bea6a41aac1e401982c43d files/digest-dillo-0.8.6 816
+SHA256 ac403826c624ccb4e772642ec599d994c23d0635372bdf8be4f2ba3c2dd842d4 files/digest-dillo-0.8.6 816
diff --git a/www-client/dillo/dillo-0.7.3-r7.ebuild b/www-client/dillo/dillo-0.7.3-r7.ebuild
deleted file mode 100644
index 532a9a624a08..000000000000
--- a/www-client/dillo/dillo-0.7.3-r7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.7.3-r7.ebuild,v 1.3 2005/07/10 20:50:24 swegener Exp $
-
-inherit flag-o-matic eutils
-
-S2=${WORKDIR}/dillo-gentoo-extras-patch3
-DILLO_I18N_MISC=${P}-i18n-misc-20040530
-
-DESCRIPTION="Lean GTK+-based web browser"
-HOMEPAGE="http://www.dillo.org/"
-SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
-	mirror://gentoo/dillo-gentoo-extras-patch3.tar.bz2
-	http://teki.jpn.ph/pc/software/${DILLO_I18N_MISC}.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~hppa ~amd64"
-IUSE="ipv6 truetype ssl nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3
-	>=media-libs/libpng-1.2.1
-	ssl? ( dev-libs/openssl )
-	truetype? ( virtual/xft )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ../${DILLO_I18N_MISC}.diff
-
-	if [ "${DILLO_ICONSET}" = "kde" ]
-	then
-		einfo "Using Konqueror style icon set"
-		cp ${S2}/pixmaps.konq.h ${S}/src/pixmaps.h
-	elif [ "${DILLO_ICONSET}" = "gnome" ]
-	then
-		einfo "Using Ximian style icon set"
-		cp ${S2}/pixmaps.ximian.h ${S}/src/pixmaps.h
-	elif [ "${DILLO_ICONSET}" = "mozilla" ]
-	then
-		einfo "Using Netscape style icon set"
-		cp ${S2}/pixmaps.netscape.h ${S}/src/pixmaps.h
-	elif [ "${DILLO_ICONSET}" = "bold" ]
-	then
-		einfo "Using bold style icon set"
-		cp ${S2}/pixmaps.bold.h ${S}/src/pixmaps.h
-	elif [ "${DILLO_ICONSET}" = "trans" ]
-	then
-		einfo "Using transparent style icon set"
-		cp ${S2}/pixmaps.trans.h ${S}/src/pixmaps.h
-	else
-		einfo "Using default Dillo icon set"
-	fi
-}
-
-src_compile() {
-	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
-
-	if use truetype ; then
-		CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		append-ldflags -L/usr/X11R6/lib -lXft
-		export CPPFLAGS
-	fi
-
-	econf `use_enable ipv6` \
-		`use_enable nls` \
-		`use_enable ssl` \
-		`use_enable truetype anti-alias` \
-		--enable-meta-refresh \
-		--enable-web-search \
-		|| die
-	emake -j1 || die
-}
-
-src_install() {
-	dodir /etc  /usr/share/icons/${PN}
-	einstall || die
-
-	dodoc AUTHORS COPYING ChangeLog* INSTALL README NEWS
-	docinto doc
-	dodoc doc/*.txt doc/README
-
-	cp ${S2}/icons/*.png ${D}/usr/share/icons/${PN}
-}
-
-pkg_postinst() {
-	einfo "This ebuild for dillo comes with different toolbar icons"
-	einfo "If you want mozilla style icons then try"
-	einfo "	DILLO_ICONSET=\"mozilla\" emerge dillo"
-	einfo
-	einfo "If you prefer konqueror style icons then try"
-	einfo "	DILLO_ICONSET=\"kde\" emerge dillo"
-	einfo
-	einfo "If you prefer ximian gnome style icons then try"
-	einfo "	DILLO_ICONSET=\"gnome\" emerge dillo"
-	einfo
-	einfo "If you prefer bold style icons then try"
-	einfo "	DILLO_ICONSET=\"bold\" emerge dillo"
-	einfo
-	einfo "If you prefer transparent style icons then try"
-	einfo "	DILLO_ICONSET=\"trans\" emerge dillo"
-	einfo
-	einfo "If the DILLO_ICONSET variable is not set, you will get the"
-	einfo "default iconset"
-	einfo
-	einfo "To see what the icons look like, please point your browser to:"
-	einfo "http://dillo.auriga.wearlab.de/Icons/"
-	einfo
-}
diff --git a/www-client/dillo/files/digest-dillo-0.7.3-r7 b/www-client/dillo/files/digest-dillo-0.7.3-r7
deleted file mode 100644
index 29f4279c8a4d..000000000000
--- a/www-client/dillo/files/digest-dillo-0.7.3-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 896f4d8c752b86376bfb445740f01470 dillo-0.7.3.tar.bz2 345295
-MD5 3bc2370883e41905791f94f0b8e2f79b dillo-gentoo-extras-patch3.tar.bz2 86929
-MD5 149189d558296e7796bf61e32e922bbb dillo-0.7.3-i18n-misc-20040530.diff.bz2 249554