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

(Portage version: 2.1.2.7)

5 files changed, 37 insertions, 24 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/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