added directfb support and fixed fbcon support to support gpm

4 files changed, 28 insertions, 15 deletions

diff --git a/net-www/links/ChangeLog b/net-www/links/ChangeLog
index e329dd81a07c..efb242ed74e2 100644
--- a/net-www/links/ChangeLog
+++ b/net-www/links/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/links
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/links/ChangeLog,v 1.28 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/ChangeLog,v 1.29 2003/09/09 09:35:05 seemant Exp $
+
+  09 Sep 2003; Seemant Kulleen <seemant@gentoo.org> links-2.1_pre11.ebuild,
+  links-2.1_pre9.ebuild:
+  added gpm to dependency list with fbcon. Thanks to Brandy Westcott
+  <brandy@gentoo.org> for the fix, provided in bug #23703 by Paul Slinski
+  <pauls@globaliqx.com>.  Also added DirectFB support thanks to Florian
+  Löding <Florian Löding> in bug #26464 opened by: Evan Langlois
+  <ekl@crc.homelinux.org>
 
 *links-2.1_pre11 (11 Jun 2003)
 
diff --git a/net-www/links/Manifest b/net-www/links/Manifest
index 4666e2c93d42..e344eff965c0 100644
--- a/net-www/links/Manifest
+++ b/net-www/links/Manifest
@@ -1,8 +1,8 @@
-MD5 305366f98433e21f55d82a5e5c9ad417 ChangeLog 5734
 MD5 62c2cb8d4841bab0f3b7bb9d0d5f270f links-0.96-r2.ebuild 1200
-MD5 6814c67ac71b29fce03b92beb1f7006b links-2.1_pre9.ebuild 2902
-MD5 60b01ddf5503cdf12d9233cde37f49d4 links-2.1_pre11.ebuild 2909
-MD5 eceb1d1aff64bd73e335f5dad2a71f42 files/digest-links-0.96-r2 62
-MD5 e8eedeca8d9b94ce7cc0e5f919500740 files/digest-links-2.1_pre9 67
+MD5 ccaa318205865c223e179a9b10e14e12 links-2.1_pre9.ebuild 2914
+MD5 a96c86177b1bbe817a9d9af0cbe09791 links-2.1_pre11.ebuild 3136
+MD5 2437e0f3343dde986b75ff6910d3884d ChangeLog 6145
 MD5 52bed2c64a669feed86577cb52f8cbb5 files/links-0.96-r2-gentoo.patch 1400
+MD5 e8eedeca8d9b94ce7cc0e5f919500740 files/digest-links-2.1_pre9 67
 MD5 71861032c7ce183e3427e4e205748323 files/digest-links-2.1_pre11 68
+MD5 eceb1d1aff64bd73e335f5dad2a71f42 files/digest-links-0.96-r2 62
diff --git a/net-www/links/links-2.1_pre11.ebuild b/net-www/links/links-2.1_pre11.ebuild
index 5f2f56bbc47e..80356a79ba4c 100644
--- a/net-www/links/links-2.1_pre11.ebuild
+++ b/net-www/links/links-2.1_pre11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre11.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre11.ebuild,v 1.4 2003/09/09 09:35:05 seemant Exp $
 
-IUSE="ssl java png X gpm tiff fbcon svga jpeg"
+IUSE="ssl javascript png X gpm tiff fbcon svga jpeg"
 
 DESCRIPTION="links is a fast lightweight text tand graphic web-browser"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
@@ -22,13 +22,14 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	gpm? ( sys-libs/gpm )
-	java? ( >=sys-devel/flex-2.5.4a )
+	javascript? ( >=sys-devel/flex-2.5.4a )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	svga? ( >=media-libs/svgalib-1.4.3 >=media-libs/libpng-1.2.1 )
 	X? ( virtual/x11 >=media-libs/libpng-1.2.1 )
-	fbcon? ( >=media-libs/libpng-1.2.1 )"
+	directfb? ( dev-libs/DirectFB )
+	fbcon? ( >=media-libs/libpng-1.2.1 sys-libs/gpm )"
 
 PROVIDE="virtual/textbrowser"
 
@@ -61,11 +62,15 @@ src_compile (){
 		&& myconf="${myconf} --enable-graphics --with-fb" \
 		|| myconf="${myconf} --without-fb"
 
+	use directfb \
+		&& myconf="${myconf} --enable-graphics --with-directfb" \
+		|| myconf="${myconf} --without-directfb"
+
 	use ssl \
-		&& myconf="${myconf} --with-ssl" \
+		&& myconf="${myconf} --enable-graphics --with-ssl" \
 		|| myconf="${myconf} --without-ssl"
 
-	use java \
+	use javascript \
 		&& myconf="${myconf} --enable-javascript" \
 		|| myconf="${myconf} --disable-javascript"
 
@@ -75,7 +80,7 @@ src_compile (){
 	# 'sys-libs/gpm' is compiled on your system, you'll compile links
 	# with gpm support ...
 
-	econf ${myconf}
+	econf ${myconf} || die "configure failed"
 	emake || die "make failed"
 }
 
diff --git a/net-www/links/links-2.1_pre9.ebuild b/net-www/links/links-2.1_pre9.ebuild
index 6e878a5305c0..ee4bc9252719 100644
--- a/net-www/links/links-2.1_pre9.ebuild
+++ b/net-www/links/links-2.1_pre9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre9.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre9.ebuild,v 1.6 2003/09/09 09:35:05 seemant Exp $
 
 IUSE="ssl java png X gpm tiff fbcon svga jpeg"
 
@@ -28,7 +28,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	svga? ( >=media-libs/svgalib-1.4.3 >=media-libs/libpng-1.2.1 )
 	X? ( virtual/x11 >=media-libs/libpng-1.2.1 )
-	fbcon? ( >=media-libs/libpng-1.2.1 )"
+	fbcon? ( >=media-libs/libpng-1.2.1 sys-libs/gpm )"
 
 PROVIDE="virtual/textbrowser"