| 1 |
ssuominen 12/02/11 15:43:51 |
| 2 |
|
| 3 |
Modified: links-2.5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Convert export to ac_cv_lib_gpm_Gpm_Open usex from eutils.eclass and USE_REQUIRED for gpm in USE fbcon and livecd. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 www-client/links/links-2.5.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/links/links-2.5.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/links/links-2.5.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/links/links-2.5.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: links-2.5.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- links-2.5.ebuild 8 Jan 2012 11:47:19 -0000 1.4 |
| 23 |
+++ links-2.5.ebuild 11 Feb 2012 15:43:51 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v 1.4 2012/01/08 11:47:19 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v 1.5 2012/02/11 15:43:51 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
inherit autotools eutils fdo-mime |
| 32 |
@@ -21,19 +21,14 @@ |
| 33 |
|
| 34 |
# We've also made USE=livecd compile in graphics mode. This closes bug #75685. |
| 35 |
PNG_DEPEND=">=media-libs/libpng-1.2:0" |
| 36 |
+ |
| 37 |
RDEPEND=">=sys-libs/ncurses-5.7-r7 |
| 38 |
bzip2? ( app-arch/bzip2 ) |
| 39 |
directfb? ( dev-libs/DirectFB ) |
| 40 |
- fbcon? ( |
| 41 |
- ${PNG_DEPEND} |
| 42 |
- sys-libs/gpm |
| 43 |
- ) |
| 44 |
+ fbcon? ( ${PNG_DEPEND} ) |
| 45 |
gpm? ( sys-libs/gpm ) |
| 46 |
jpeg? ( virtual/jpeg ) |
| 47 |
- livecd? ( |
| 48 |
- ${PNG_DEPEND} |
| 49 |
- sys-libs/gpm |
| 50 |
- ) |
| 51 |
+ livecd? ( ${PNG_DEPEND} ) |
| 52 |
lzma? ( app-arch/xz-utils ) |
| 53 |
ssl? ( dev-libs/openssl:0 ) |
| 54 |
svga? ( |
| 55 |
@@ -46,11 +41,12 @@ |
| 56 |
x11-libs/libXext |
| 57 |
) |
| 58 |
zlib? ( sys-libs/zlib )" |
| 59 |
+ |
| 60 |
DEPEND="${RDEPEND} |
| 61 |
dev-util/pkgconfig" |
| 62 |
|
| 63 |
-REQUIRED_USE="fbcon? ( jpeg ) |
| 64 |
- livecd? ( jpeg ) |
| 65 |
+REQUIRED_USE="fbcon? ( jpeg gpm ) |
| 66 |
+ livecd? ( jpeg gpm ) |
| 67 |
svga? ( suid )" |
| 68 |
|
| 69 |
DOCS=( AUTHORS BRAILLE_HOWTO BUGS ChangeLog KEYS NEWS README SITES TODO ) |
| 70 |
@@ -74,14 +70,14 @@ |
| 71 |
} |
| 72 |
|
| 73 |
src_configure() { |
| 74 |
+ export ac_cv_lib_gpm_Gpm_Open=$(usex gpm) |
| 75 |
+ |
| 76 |
local myconf |
| 77 |
|
| 78 |
if use X || use fbcon || use directfb || use svga || use livecd; then |
| 79 |
myconf="${myconf} --enable-graphics" |
| 80 |
fi |
| 81 |
|
| 82 |
- ( use gpm || use fbcon || use livecd ) || export ac_cv_lib_gpm_Gpm_Open=no |
| 83 |
- |
| 84 |
if use fbcon || use livecd; then |
| 85 |
myconf="${myconf} --with-fb" |
| 86 |
else |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.156 www-client/links/ChangeLog |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/links/ChangeLog?rev=1.156&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/links/ChangeLog?rev=1.156&content-type=text/plain |
| 94 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/links/ChangeLog?r1=1.155&r2=1.156 |
| 95 |
|
| 96 |
Index: ChangeLog |
| 97 |
=================================================================== |
| 98 |
RCS file: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v |
| 99 |
retrieving revision 1.155 |
| 100 |
retrieving revision 1.156 |
| 101 |
diff -u -r1.155 -r1.156 |
| 102 |
--- ChangeLog 11 Feb 2012 15:33:48 -0000 1.155 |
| 103 |
+++ ChangeLog 11 Feb 2012 15:43:51 -0000 1.156 |
| 104 |
@@ -1,6 +1,10 @@ |
| 105 |
# ChangeLog for www-client/links |
| 106 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 107 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.155 2012/02/11 15:33:48 ssuominen Exp $ |
| 108 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.156 2012/02/11 15:43:51 ssuominen Exp $ |
| 109 |
+ |
| 110 |
+ 11 Feb 2012; Samuli Suominen <ssuominen@g.o> links-2.5.ebuild: |
| 111 |
+ Convert export to ac_cv_lib_gpm_Gpm_Open usex from eutils.eclass and |
| 112 |
+ USE_REQUIRED for gpm in USE fbcon and livecd. |
| 113 |
|
| 114 |
11 Feb 2012; Samuli Suominen <ssuominen@g.o> |
| 115 |
-links-2.3_pre1-r1.ebuild, -files/links-2.3_pre1-libpng-1.5.patch, |
Archives