Remove an old ebuild. Revbump for security bug #177512.

Package-Manager: portage-2.1.2.7

6 files changed, 55 insertions, 43 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 651664840377..30cd6f1ba594 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.79 2007/05/21 17:22:47 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.80 2007/05/21 20:57:59 spock Exp $
+
+*elinks-0.11.2-r1 (21 May 2007)
+
+  21 May 2007; Michał Januszewski <spock@gentoo.org> -elinks-0.11.1.ebuild,
+  +elinks-0.11.2-r1.ebuild:
+  Remove an old ebuild. Revbump for security bug #177512.
 
   21 May 2007; Michał Januszewski <spock@gentoo.org>
   +files/elinks-po-path.patch, elinks-0.11.1.ebuild, elinks-0.11.2.ebuild,
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index a66b0838f94d..4d0b4a1963ea 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -42,42 +42,41 @@ MD5 783a5a99acb6c13f2fbec504a96458f7 files/elinks-po-path.patch 1387
 RMD160 47b0d596a607c476b94e88d8fe4e65ca0bbf6174 files/elinks-po-path.patch 1387
 SHA256 18a5299dcea9fee1ef22c3257e09bd0dbc0567cb1aee6750aba9d185bca374cf files/elinks-po-path.patch 1387
 DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
-DIST elinks-0.11.1.tar.bz2 2612791 RMD160 2c5039a2e3d7ee3fc283d3041cac40f3c7853520 SHA1 dfa18f2745976e34ce3ee27227ce9bce81495a77 SHA256 d18c723840a91989e79273215363391567b9a48b901efa458fb3974e8487327d
 DIST elinks-0.11.2.tar.bz2 2497270 RMD160 a9d938cfdfa71be282b7596e1fed5797f2efd6a5 SHA1 47669c38e1e5ebb35015a9a9a8f9c898821bd408 SHA256 91ac894715efcde78548dfe4703ae702f08fb4a94187288eb9ba2b30258d5585
 DIST elinks-0.11.3.tar.bz2 2516793 RMD160 936f0cd4dbc69f70c329cf0ef5d7acd722652b6e SHA1 e4d8b0edd5fa4ec4310662242f0b5cf32864ed11 SHA256 c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1
-EBUILD elinks-0.11.1.ebuild 4653 RMD160 8538548747915b9e90ebc4cbfba26f30c9e9b0aa SHA1 0e3c809f19b7cf06a9adba8fd093ff024e5f7a60 SHA256 70f53d216b8f31a481073d3b73080c6f483059ecf91e35814c43153c32f5d788
-MD5 a1c8994714bbf562ee94968ea3b41cb1 elinks-0.11.1.ebuild 4653
-RMD160 8538548747915b9e90ebc4cbfba26f30c9e9b0aa elinks-0.11.1.ebuild 4653
-SHA256 70f53d216b8f31a481073d3b73080c6f483059ecf91e35814c43153c32f5d788 elinks-0.11.1.ebuild 4653
-EBUILD elinks-0.11.2.ebuild 4890 RMD160 4d982355d30199415a0474ee34e5194ad3f56f7e SHA1 406f5f1d834ef891414dd62f3e3900f224070d25 SHA256 ee8f906599d2507fa391f40ebd9b1d9f5c712b966dacc1a8b031a91edd1e4c91
-MD5 3bc5cc1492bfe58e4339d0787e6fb871 elinks-0.11.2.ebuild 4890
-RMD160 4d982355d30199415a0474ee34e5194ad3f56f7e elinks-0.11.2.ebuild 4890
-SHA256 ee8f906599d2507fa391f40ebd9b1d9f5c712b966dacc1a8b031a91edd1e4c91 elinks-0.11.2.ebuild 4890
+EBUILD elinks-0.11.2-r1.ebuild 4900 RMD160 30873b229ad8e0e84ff51adc4bad3e968a1adfd8 SHA1 230ed5709ed960dcc925666068e72bafe63c4b37 SHA256 20707fe3dc0f9a84664da5fa82a0b308a6b903336e23f5aba429fe6261061b18
+MD5 71aeffe47a876536d22e73911c3d420b elinks-0.11.2-r1.ebuild 4900
+RMD160 30873b229ad8e0e84ff51adc4bad3e968a1adfd8 elinks-0.11.2-r1.ebuild 4900
+SHA256 20707fe3dc0f9a84664da5fa82a0b308a6b903336e23f5aba429fe6261061b18 elinks-0.11.2-r1.ebuild 4900
+EBUILD elinks-0.11.2.ebuild 4849 RMD160 a381560a3d925b167aeb074455b722130f799ee2 SHA1 5f65ac263e141f3acd5beac3adf449e49fc96497 SHA256 f760351519073676fd6a52f487dd3d69ce58cd39a5924cdc8bd08633f26c4b2f
+MD5 353b378c5e0caa4eef5fc7a8a17df407 elinks-0.11.2.ebuild 4849
+RMD160 a381560a3d925b167aeb074455b722130f799ee2 elinks-0.11.2.ebuild 4849
+SHA256 f760351519073676fd6a52f487dd3d69ce58cd39a5924cdc8bd08633f26c4b2f elinks-0.11.2.ebuild 4849
 EBUILD elinks-0.11.3.ebuild 4759 RMD160 c0864039c63940c3e7ffe81ec783c7c99d4c3967 SHA1 e30b7b6c014309d29f4feb5be574bc53df78ddcb SHA256 de49554ae67603e6815fbd140c5d7ba237b45527b61a11a8a0d80403be7a97f2
 MD5 6bc2be57c6b9cdf41737b7c3f42b3b92 elinks-0.11.3.ebuild 4759
 RMD160 c0864039c63940c3e7ffe81ec783c7c99d4c3967 elinks-0.11.3.ebuild 4759
 SHA256 de49554ae67603e6815fbd140c5d7ba237b45527b61a11a8a0d80403be7a97f2 elinks-0.11.3.ebuild 4759
-MISC ChangeLog 18406 RMD160 0a010fefe5389eedb5353d6e5247e6d0b4bf8a85 SHA1 d2903f028c74d49c45ca5fe6b6d75a2864c5d8c1 SHA256 fc9edf52f3649fc05bf3eae9a8b308bcaabfbd5be83f10881dd7fc9c2f19dd5a
-MD5 f39e2b793afb5e68bab1d2bff3f5516d ChangeLog 18406
-RMD160 0a010fefe5389eedb5353d6e5247e6d0b4bf8a85 ChangeLog 18406
-SHA256 fc9edf52f3649fc05bf3eae9a8b308bcaabfbd5be83f10881dd7fc9c2f19dd5a ChangeLog 18406
+MISC ChangeLog 18603 RMD160 6bc1a34d66e7551ba3e970387499c6b5a1fad68c SHA1 53abe5a452542c1b79a342e81ea538f5164625e1 SHA256 c28f0129f3c46812a124ed76e20c8d8a842b5bb3a80cd950dd442cd073bb676d
+MD5 b415e7edaed5c473792775f2fc4a8aaf ChangeLog 18603
+RMD160 6bc1a34d66e7551ba3e970387499c6b5a1fad68c ChangeLog 18603
+SHA256 c28f0129f3c46812a124ed76e20c8d8a842b5bb3a80cd950dd442cd073bb676d ChangeLog 18603
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5 metadata.xml 255
-MD5 45e259fce18e6070e87cc5b34299ba7f files/digest-elinks-0.11.1 488
-RMD160 37761cfb079d42fe6388ab4c8a3303b84d7dfb8c files/digest-elinks-0.11.1 488
-SHA256 0074385608ba5c7e0b6193b003b5218c75d179e3bbdb1d1134328332f71ffc6b files/digest-elinks-0.11.1 488
 MD5 347a412177c8b073af1160e65e777faf files/digest-elinks-0.11.2 488
 RMD160 ca4e65389badb922c60d3868caa2fab0ae977804 files/digest-elinks-0.11.2 488
 SHA256 64a75a4378c0194214ae924b00385c215e1463cd0bfd71dd04d56ce00a5f7483 files/digest-elinks-0.11.2 488
+MD5 347a412177c8b073af1160e65e777faf files/digest-elinks-0.11.2-r1 488
+RMD160 ca4e65389badb922c60d3868caa2fab0ae977804 files/digest-elinks-0.11.2-r1 488
+SHA256 64a75a4378c0194214ae924b00385c215e1463cd0bfd71dd04d56ce00a5f7483 files/digest-elinks-0.11.2-r1 488
 MD5 8512c43988ba78773657615251c22d4b files/digest-elinks-0.11.3 488
 RMD160 02d9eb5ca13629b09703418c70dd7da6bef9e2eb files/digest-elinks-0.11.3 488
 SHA256 07212a85189d571790777d937ad45aca72a20e4fbb54d784a5feb9b2d4c8dcbd files/digest-elinks-0.11.3 488
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGUdV5chej4aZK9/cRAstYAJ47miRi7DxIZ/5jU9a49DrNHZpltwCdFCd1
-rXyIwWlD91JDrig/crSI7hA=
-=QjEK
+iD8DBQFGUgffchej4aZK9/cRAodxAJ9YdoIsdsjiKPIiPlGTRqi/3aUxmACff67Z
+W6y9AkwhcC6KkPey7/M6Xtk=
+=v9vc
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.1.ebuild b/www-client/elinks/elinks-0.11.2-r1.ebuild
index dfeffbbf3298..d93e66bfe9ba 100644
--- a/www-client/elinks/elinks-0.11.1.ebuild
+++ b/www-client/elinks/elinks-0.11.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.1.ebuild,v 1.16 2007/05/21 17:22:47 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2-r1.ebuild,v 1.1 2007/05/21 20:57:59 spock Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
 
-inherit eutils autotools
+inherit eutils autotools flag-o-matic
 
-MY_P=${P/_/}
+MY_P="${P/_/}"
 DESCRIPTION="Advanced and well-established text-mode web browser"
 HOMEPAGE="http://elinks.or.cz/"
 SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
@@ -15,9 +15,9 @@ SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
-	  javascript lua nls nntp perl ruby samba ssl unicode X zlib"
+	  javascript lua nls nntp perl ruby ssl unicode X zlib"
 RESTRICT="test"
 
 DEPEND=">=dev-libs/expat-1.95.4
@@ -32,11 +32,19 @@ DEPEND=">=dev-libs/expat-1.95.4
 	idn? ( net-dns/libidn )
 	perl? ( sys-devel/libperl )
 	ruby? ( dev-lang/ruby )
-	!hppa? ( !mips? ( !alpha? ( javascript? ( dev-lang/spidermonkey ) ) ) )
-	samba? ( net-fs/samba )"
+	!hppa? ( !mips? ( !alpha? ( javascript? ( dev-lang/spidermonkey ) ) ) )"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use guile && has_version ">dev-scheme/guile-1.6.8" &&
+	   ! built_with_use -a dev-scheme/guile deprecated discouraged; then
+		eerror "To install elinks with the 'guile' USE flag, dev-scheme/guile has to"
+		eerror "be built with 'deprecated' and 'discouraged' USE flags."
+		die "dev-scheme/guile not built with deprecated/discouraged"
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
@@ -50,9 +58,16 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.11.0-gcc4-inline.patch
 	epatch ${FILESDIR}/${PN}-0.11.0-ruby.patch
 	epatch ${FILESDIR}/${PN}-0.11.1-time.patch
+	epatch ${FILESDIR}/${PN}-0.11.2-lua-5.patch
+
+	if use lua && has_version ">=dev-lang/lua-5.1"; then
+		epatch ${FILESDIR}/${PN}-0.11.2-lua-5.1.patch
+	fi
+
 	if use unicode ; then
 		epatch ${FILESDIR}/elinks-0.10.1-utf_8_io-default.patch
 	fi
+
 	epatch ${FILESDIR}/elinks-po-path.patch
 	sed -i -e 's/-Werror//' configure*
 }
@@ -96,7 +111,6 @@ src_compile() {
 		$(use_enable bittorrent) \
 		$(use_enable nls) \
 		$(use_enable ipv6) \
-		$(use_enable samba smb) \
 		$(use_enable ftp) \
 		$(use_enable gopher) \
 		$(use_enable nntp) \
@@ -135,12 +149,6 @@ pkg_postinst() {
 	einfo
 	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
 	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
-	if use guile ; then
-		einfo
-		einfo "Since you have compiled ELinks with Guile support, you will have to"
-		einfo "copy internal-hooks.scm and user-hooks.scm from"
-		einfo "/usr/share/doc/${PF}/contrib/guile/ to ~/.elinks/"
-	fi
 	einfo
 	einfo "You will have to set your TERM variable to 'xterm-256color'"
 	einfo "to be able to use 256 colors in elinks."
diff --git a/www-client/elinks/elinks-0.11.2.ebuild b/www-client/elinks/elinks-0.11.2.ebuild
index 9091e7f1a7e3..9ee5e193da70 100644
--- a/www-client/elinks/elinks-0.11.2.ebuild
+++ b/www-client/elinks/elinks-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.15 2007/05/21 17:22:47 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.16 2007/05/21 20:57:59 spock Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
@@ -68,7 +68,6 @@ src_unpack() {
 		epatch ${FILESDIR}/elinks-0.10.1-utf_8_io-default.patch
 	fi
 
-	epatch ${FILESDIR}/elinks-po-path.patch
 	sed -i -e 's/-Werror//' configure*
 }
 
diff --git a/www-client/elinks/files/digest-elinks-0.11.1 b/www-client/elinks/files/digest-elinks-0.11.1
deleted file mode 100644
index 650ad78241cb..000000000000
--- a/www-client/elinks/files/digest-elinks-0.11.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 09e76c99955076aac144e9097f22a36f elinks-0.10.4.conf.bz2 5370
-RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 elinks-0.10.4.conf.bz2 5370
-SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209 elinks-0.10.4.conf.bz2 5370
-MD5 db0d62394b03938eec81b749e49dfbbc elinks-0.11.1.tar.bz2 2612791
-RMD160 2c5039a2e3d7ee3fc283d3041cac40f3c7853520 elinks-0.11.1.tar.bz2 2612791
-SHA256 d18c723840a91989e79273215363391567b9a48b901efa458fb3974e8487327d elinks-0.11.1.tar.bz2 2612791
diff --git a/www-client/elinks/files/digest-elinks-0.11.2-r1 b/www-client/elinks/files/digest-elinks-0.11.2-r1
new file mode 100644
index 000000000000..0adaf3d09aa8
--- /dev/null
+++ b/www-client/elinks/files/digest-elinks-0.11.2-r1
@@ -0,0 +1,6 @@
+MD5 09e76c99955076aac144e9097f22a36f elinks-0.10.4.conf.bz2 5370
+RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 elinks-0.10.4.conf.bz2 5370
+SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209 elinks-0.10.4.conf.bz2 5370
+MD5 5a8f83afb527cf443f58b372136a81fc elinks-0.11.2.tar.bz2 2497270
+RMD160 a9d938cfdfa71be282b7596e1fed5797f2efd6a5 elinks-0.11.2.tar.bz2 2497270
+SHA256 91ac894715efcde78548dfe4703ae702f08fb4a94187288eb9ba2b30258d5585 elinks-0.11.2.tar.bz2 2497270