Version bump (bug #110501). Removed old ebuilds.

(Portage version: 1.589-cvs)

8 files changed, 63 insertions, 222 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 4f76c4020909..98d7e6ac8b6c 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.24 2005/10/23 14:41:23 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.25 2005/10/29 18:22:03 spock Exp $
+
+*elinks-0.10.6 (29 Oct 2005)
+
+  29 Oct 2005; Michał Januszewski <spock@gentoo.org> -elinks-0.10.2.ebuild,
+  -elinks-0.10.3.ebuild, -elinks-0.10.4.ebuild, +elinks-0.10.6.ebuild:
+  Version bump (bug #110501). Removed old ebuilds.
 
   23 Oct 2005; Michał Januszewski <spock@gentoo.org>
   elinks-0.10.5-r1.ebuild:
diff --git a/www-client/elinks/elinks-0.10.2.ebuild b/www-client/elinks/elinks-0.10.2.ebuild
deleted file mode 100644
index 418171e994ef..000000000000
--- a/www-client/elinks/elinks-0.10.2.ebuild
+++ /dev/null
@@ -1,99 +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/elinks/elinks-0.10.2.ebuild,v 1.4 2005/05/05 22:43:31 swegener Exp $
-
-IUSE="gpm zlib ssl ipv6 X lua guile"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_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
-	http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.9.1.conf.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc amd64 ~alpha"
-
-DEPEND="virtual/libc
-	>=app-arch/bzip2-1.0.2
-	>=dev-libs/expat-1.95.4
-	>=sys-apps/portage-2.0.45-r3
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	X? ( virtual/x11 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	lua? ( >=dev-lang/lua-4 )
-	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-util/guile-1.6.4-r1 )"
-PROVIDE="virtual/textbrowser"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-
-	mv "${PN}-0.9.1.conf" "${PN}.conf"
-	sed -i \
-		-e 's:CONFIG_256_COLORS=.*:CONFIG_256_COLORS=yes:' \
-		-e 's:CONFIG_LEDS=.*:CONFIG_LEDS=yes:' \
-		-e 's:CONFIG_HTML_HIGHLIGHT=.*:CONFIG_HTML_HIGHLIGHT=yes:' \
-		${S}/features.conf
-}
-
-src_compile() {
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
-
-	econf	--sysconfdir=/etc/elinks \
-		--enable-leds \
-		`use_with gpm` \
-		`use_with zlib` \
-		`use_with ssl openssl` \
-		`use_with X x` \
-		`use_enable ipv6` \
-		`use_with lua` \
-		`use_with guile`	|| die
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die
-
-	insopts -m 644 ; insinto /etc/elinks
-	doins ${WORKDIR}/elinks.conf
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
-	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
-	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-}
-
-# disable it as the only test available is interactive..
-src_test() {
-	return 0
-}
-
-pkg_postinst() {
-	einfo "This ebuild provides a default config for ELinks."
-	einfo "Please check /etc/elinks/elinks.conf"
-	einfo
-	einfo "You may want to convert your html.cfg and links.cfg of"
-	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
-	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	einfo
-	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
-	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
-	einfo
-	einfo "If 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/"
-	einfo
-	einfo "You will have to set your TERM variable to 'xterm-256color'"
-	einfo "to be able to use 256 colors in elinks."
-	echo
-}
diff --git a/www-client/elinks/elinks-0.10.3.ebuild b/www-client/elinks/elinks-0.10.3.ebuild
deleted file mode 100644
index b928d20eec39..000000000000
--- a/www-client/elinks/elinks-0.10.3.ebuild
+++ /dev/null
@@ -1,99 +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/elinks/elinks-0.10.3.ebuild,v 1.3 2005/05/07 17:53:44 spock Exp $
-
-IUSE="gpm zlib ssl ipv6 X lua guile"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_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
-	http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.9.1.conf.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~amd64 ~alpha"
-
-DEPEND="virtual/libc
-	>=app-arch/bzip2-1.0.2
-	>=dev-libs/expat-1.95.4
-	>=sys-apps/portage-2.0.45-r3
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	X? ( virtual/x11 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	lua? ( >=dev-lang/lua-4 )
-	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-util/guile-1.6.4-r1 )"
-PROVIDE="virtual/textbrowser"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-
-	mv "${PN}-0.9.1.conf" "${PN}.conf"
-	sed -i \
-		-e 's:CONFIG_256_COLORS=.*:CONFIG_256_COLORS=yes:' \
-		-e 's:CONFIG_LEDS=.*:CONFIG_LEDS=yes:' \
-		-e 's:CONFIG_HTML_HIGHLIGHT=.*:CONFIG_HTML_HIGHLIGHT=yes:' \
-		${S}/features.conf
-}
-
-src_compile() {
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
-
-	econf	--sysconfdir=/etc/elinks \
-		--enable-leds \
-		`use_with gpm` \
-		`use_with zlib` \
-		`use_with ssl openssl` \
-		`use_with X x` \
-		`use_enable ipv6` \
-		`use_with lua` \
-		`use_with guile`	|| die
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die
-
-	insopts -m 644 ; insinto /etc/elinks
-	doins ${WORKDIR}/elinks.conf
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
-	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
-	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-}
-
-# disable it as the only test available is interactive..
-src_test() {
-	return 0
-}
-
-pkg_postinst() {
-	einfo "This ebuild provides a default config for ELinks."
-	einfo "Please check /etc/elinks/elinks.conf"
-	einfo
-	einfo "You may want to convert your html.cfg and links.cfg of"
-	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
-	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	einfo
-	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
-	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
-	einfo
-	einfo "If 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/"
-	einfo
-	einfo "You will have to set your TERM variable to 'xterm-256color'"
-	einfo "to be able to use 256 colors in elinks."
-	echo
-}
diff --git a/www-client/elinks/elinks-0.10.4.ebuild b/www-client/elinks/elinks-0.10.6.ebuild
index 14f8dc66fab7..3db1fe9ab627 100644
--- a/www-client/elinks/elinks-0.10.4.ebuild
+++ b/www-client/elinks/elinks-0.10.6.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.4.ebuild,v 1.8 2005/06/17 21:03:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.6.ebuild,v 1.1 2005/10/29 18:22:03 spock Exp $
 
-IUSE="gpm zlib ssl ipv6 X lua guile"
+inherit eutils
+
+IUSE="gpm zlib bzip2 ssl X lua guile perl ruby gnutls idn javascript ipv6 \
+samba ftp gopher nntp finger javascript debug nls"
 
 MY_P=${P/_/}
-S=${WORKDIR}/${MY_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
@@ -13,46 +15,73 @@ SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 
 DEPEND="virtual/libc
-	>=app-arch/bzip2-1.0.2
 	>=dev-libs/expat-1.95.4
-	>=sys-apps/portage-2.0.45-r3
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	X? ( virtual/x11 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	lua? ( >=dev-lang/lua-4 )
 	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-util/guile-1.6.4-r1 )"
+	guile? ( >=dev-util/guile-1.6.4-r1 )
+	idn? ( net-dns/libidn )
+	perl? ( sys-devel/libperl )
+	ruby? ( dev-lang/ruby )
+	!mips? ( !alpha? ( javascript? ( dev-lang/spidermonkey ) ) )
+	samba? ( net-fs/samba )"
+
 PROVIDE="virtual/textbrowser"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
-
 	mv "${PN}-0.10.4.conf" "${PN}.conf"
-	sed -i \
-		-e 's:CONFIG_256_COLORS=.*:CONFIG_256_COLORS=yes:' \
-		-e 's:CONFIG_LEDS=.*:CONFIG_LEDS=yes:' \
-		-e 's:CONFIG_HTML_HIGHLIGHT=.*:CONFIG_HTML_HIGHLIGHT=yes:' \
-		${S}/features.conf
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
+	fi
+
+	use ppc-macos && epatch ${FILESDIR}/${PN}-osx-configure.diff
 }
 
 src_compile() {
 	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
 	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
 	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+	local myconf=""
+
+	if use debug ; then
+		myconf="--enable-debug"
+	else
+		myconf="--enable-fastmem"
+	fi
 
-	econf	--sysconfdir=/etc/elinks \
+	econf --sysconfdir=/etc/elinks \
 		--enable-leds \
+		--enable-256-colors \
+		--enable-html-highlight \
 		`use_with gpm` \
 		`use_with zlib` \
+		`use_with bzip2 bzlib` \
 		`use_with ssl openssl` \
 		`use_with X x` \
-		`use_enable ipv6` \
 		`use_with lua` \
-		`use_with guile`	|| die
+		`use_with guile` \
+		`use_with perl` \
+		`use_with ruby` \
+		`use_with idn` \
+		`use_with javascript spidermonkey` \
+		`use_enable nls` \
+		`use_enable ipv6` \
+		`use_enable samba smb` \
+		`use_enable ftp` \
+		`use_enable gopher` \
+		`use_enable nntp` \
+		`use_enable finger` \
+		"${myconf}" || die
 
 	emake || die "compile problem"
 }
@@ -71,9 +100,17 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
 	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
 	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+
+	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
+	# are more or less the same.  -- Fabian Groffen (2005-06-30)
+	if use ppc-macos; then
+		rm -f ${D}/usr/lib/charset.alias
+	fi
+
+	rm -f ${D}/usr/share/locale/locale.alias
 }
 
-# disable it as the only test available is interactive..
+# Disable it as the only test available is interactive..
 src_test() {
 	return 0
 }
diff --git a/www-client/elinks/files/digest-elinks-0.10.2 b/www-client/elinks/files/digest-elinks-0.10.2
deleted file mode 100644
index 854662d6470c..000000000000
--- a/www-client/elinks/files/digest-elinks-0.10.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7bf8981fb7502f3411bd114061751994 elinks-0.10.2.tar.bz2 2267309
-MD5 ea3df881970bfd6f7bbed3039c22e8a6 elinks-0.9.1.conf.bz2 5398
diff --git a/www-client/elinks/files/digest-elinks-0.10.3 b/www-client/elinks/files/digest-elinks-0.10.3
deleted file mode 100644
index 5ff34e8d910d..000000000000
--- a/www-client/elinks/files/digest-elinks-0.10.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 78a12a5500c3e726aa7365cca216e880 elinks-0.10.3.tar.bz2 2285731
-MD5 ea3df881970bfd6f7bbed3039c22e8a6 elinks-0.9.1.conf.bz2 5398
diff --git a/www-client/elinks/files/digest-elinks-0.10.4 b/www-client/elinks/files/digest-elinks-0.10.4
deleted file mode 100644
index 5a5b39a2c65d..000000000000
--- a/www-client/elinks/files/digest-elinks-0.10.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0bcc8324f70dba46503af15023c8ee0f elinks-0.10.4.tar.bz2 2318559
-MD5 09e76c99955076aac144e9097f22a36f elinks-0.10.4.conf.bz2 5370
diff --git a/www-client/elinks/files/digest-elinks-0.10.6 b/www-client/elinks/files/digest-elinks-0.10.6
new file mode 100644
index 000000000000..08c8d94da017
--- /dev/null
+++ b/www-client/elinks/files/digest-elinks-0.10.6
@@ -0,0 +1,2 @@
+MD5 f539c07a7b0e19e8f1c6f35f7d406841 elinks-0.10.6.tar.bz2 2390414
+MD5 09e76c99955076aac144e9097f22a36f elinks-0.10.4.conf.bz2 5370