Change icon format from .xpm to .png and create desktop entry.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

3 files changed, 139 insertions, 10 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 369527a3e030..cfcc3a4d427f 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.138 2011/11/24 20:31:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.139 2011/11/25 00:24:16 ssuominen Exp $
+
+*links-2.4-r1 (25 Nov 2011)
+
+  25 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> +links-2.4-r1.ebuild:
+  Change icon format from .xpm to .png and create desktop entry.
 
   24 Nov 2011; Tim Harder <radhermit@gentoo.org> -links-2.2.ebuild,
   -files/configure-LANG.patch, metadata.xml:
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 93295f61a826..aa5b07a4317c 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX links-2.3_pre1-libpng-1.5.patch 1232 RMD160 999358a40826d30d55eb4222358f71a7f30af9a1 SHA1 13018fbd6e89d3d64bfe436f1e681dec03b5cb15 SHA256 9109075a010ffe68f5b295a70adf573f5ec77d2ff204a7768b8f78e64eb6256a
 AUX links-2.3_pre1-verify-ssl-certs.patch 1840 RMD160 7f38e7ddb1af06fc55cd23a749c02a7afbc0f8c3 SHA1 4726405578261027c3d28177eae02d4d808c480f SHA256 5fb7df573de849a2bfa7ad9b7c6ce150afe3f2c42a862945fabd57ca5ae66c34
 DIST links-2.3pre1.tar.bz2 3832651 RMD160 f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de SHA1 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d SHA256 21ab49f2f24359ef2d0e634a7926f76419084bd792af28746323b2f16c229bde
 DIST links-2.4.tar.bz2 3843247 RMD160 9ede914cba25925356e3f69a3f40794821326235 SHA1 c09fcb03874b1d0586f582f73833bb2f4c9ed7ac SHA256 bebb6ccafaaabf1d251ccd79ff5cda07078a11bf7d15e775d6f3a0a89d4dd125
 EBUILD links-2.3_pre1-r1.ebuild 3475 RMD160 8352313b0b496d876ebc3cea692c295b0fca1ada SHA1 12af946a7668405bd1f5e0de751c99d1d39d8622 SHA256 80f53c0db696f15084013fd9f6db351f77fcf4d5609fba77def9b84ce0ebd8dc
+EBUILD links-2.4-r1.ebuild 3250 RMD160 0b4f6fd0eaabf93fb74e6a730a203af934e976d5 SHA1 89f423009468e29ed7819def3fa6406a9bcade08 SHA256 42fd9ad7927bc204b8fbb95816ce622fa9e7e5c43f9b9fdbd1b35a282a2f8cbb
 EBUILD links-2.4.ebuild 3265 RMD160 26e77d23c7f35f9d4610ff07868d2e016a43fe0b SHA1 f413882ac525290be16a76979c5b7c6c6bb77b42 SHA256 bc5976dce56e4ebfd620860acc4bbddcaa5c4515c775ce2732112637086742ab
-MISC ChangeLog 29099 RMD160 aad7a8216d2916ff2d6b29891e8ffc259e9ab5b8 SHA1 2951ef036f75050ba32f24f68e958074f4f28c60 SHA256 349a77b9399916e4c231a23ee1784e37ec075042d76665681e0f6dbebdb1497b
+MISC ChangeLog 29270 RMD160 bfe10716a2c7d9756a5f929a2dab2ae7758fa040 SHA1 ef21d48ed9cdfcd4b9fa7f0e72d80c37298676c8 SHA256 6f7e5d9c93f040fb927d440b38b39810cb6cfeeb331f801abc69413ef92f915a
 MISC metadata.xml 250 RMD160 7a90e29ad84aff28c2c6afa3bca41ddbe7f9aa75 SHA1 433036bcd0cfbbf1645c890e6211dc150b33be1c SHA256 353d603624c10b4af32b44438a7f53a6d166daa5cfce1fc90f8089b78e49a0f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOzqm/AAoJEEqz6FtPBkyjscwIALW5RDbYDfMvxlqUH4JNmXk7
-19IFka9QAWcTWnA/xpc8HOlzpNMJZoxXA5AZbW1lPWxMiz4FoTLlVL33g0r6fLGt
-Zl7B9kGSX1SMlYSpUjOeh3+EfqgTnao3ms6pkJPx2tgHhYdYiBT2jAk2mMlaLBXY
-n2Jq1a3LY6VzA4ARVlKGY+NAuOSnG6kDyOzJQn9YVxymIoB3u2QROvrD00xsD2XD
-2Qn5L0fnTQjCCi9L/ETdgKdjce+aadIozm/lNj9QR+UpiPEd2eSw3aH0pZKI5axi
-YngjqrDUeDV77oVnbOEdGDUURN/VqYktzyaCSg66DcIrI0WXKyYT9WyhDKpRDUc=
-=JK3U
+iQEcBAEBAgAGBQJOzt+zAAoJEEdUh39IaPFN0XMH/R/nwa/0yfZlwGs/fg57v0+/
+AdznTZAXgPu1FHOtiRYePxI8aHlkrcUFhhi8pW5iBO7TAuqnijmoyvCGh1xQaqqo
+pBK4fUXVZiMAxiM+cLzhWueV6mHsmPlIZ5RVbuKq3ygIoDRh6/xvCOeGF4AakrDT
+zFPbZD8QlLKzku9hIzhOaTU1Gkcz9H8AhOY4CqzwAIpCIlevB9eXJRBRz9GwOAgK
+bz2ColveiPtxceHvuz/1V8PfZsVHK5tmbdNJc1zDIzRPQ7QSDWEPk+i+tggcFeBO
+n6hKYlbdMxmzAjIWniypt9326eb2r5OpEYiBFohSNxn4Icm78oZE3JvpZH9bML0=
+=MPMm
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.4-r1.ebuild b/www-client/links/links-2.4-r1.ebuild
new file mode 100644
index 000000000000..6b91c3ae8842
--- /dev/null
+++ b/www-client/links/links-2.4-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.4-r1.ebuild,v 1.1 2011/11/25 00:24:16 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="links is a fast lightweight text and graphic web-browser"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 directfb fbcon gpm jpeg livecd ssl svga tiff unicode X zlib"
+
+# Note: if X or fbcon usegflag are enabled, links will be built in graphic
+# mode. libpng is required to compile links in graphic mode
+# (not required in text mode), so let's add libpng for X? and fbcon?
+
+# We've also made USE=livecd compile in graphics mode.  This closes bug #75685.
+
+# 2.3_pre1: SDL support is disabled in this version by upstream: sdl? ( >=media-libs/libsdl-1.2.0 )
+RDEPEND="ssl? ( dev-libs/openssl:0 )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg )
+	fbcon? (
+		media-libs/libpng:0
+		virtual/jpeg
+		sys-libs/gpm
+		)
+	tiff? ( media-libs/tiff:0 )
+	svga? (
+		>=media-libs/svgalib-1.4.3
+		media-libs/libpng:0
+		)
+	X? (
+		x11-libs/libXext
+		media-libs/libpng:0
+		)
+	directfb? ( dev-libs/DirectFB )
+	sys-libs/ncurses
+	livecd? (
+		media-libs/libpng:0
+		virtual/jpeg
+		sys-libs/gpm
+		)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS=( AUTHORS BRAILLE_HOWTO BUGS ChangeLog KEYS NEWS README SITES TODO )
+
+src_prepare() {
+	if use unicode ; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	fi
+
+	# Upstream configure produced by broken autoconf-2.13.  See #131440 and
+	# #103483#c23.  This also fixes toolchain detection.
+	eautoconf
+}
+
+src_configure() {
+	local myconf
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf="${myconf} --enable-graphics"
+	fi
+
+	# Note: --enable-static breaks.
+
+	# Note: ./configure only support 'gpm' features auto-detection, so
+	# we use the autoconf trick
+	( use gpm || use fbcon || use livecd ) || export ac_cv_lib_gpm_Gpm_Open="no"
+
+	if use fbcon || use livecd ; then
+		myconf="${myconf} --with-fb"
+	else
+		myconf="${myconf} --without-fb"
+	fi
+
+	# force --with-libjpeg if livecd flag is set
+	if use livecd ; then
+		myconf="${myconf} --with-libjpeg"
+	fi
+
+	#	$(use_with sdl)
+	econf \
+		$(use_with X x) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with svga svgalib) \
+		$(use_with directfb) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use X; then
+		newicon Links_logo.png ${PN}.png
+		make_desktop_entry "${PN} -g" Links ${PN} "Network;WebBrowser"
+	fi
+
+	dohtml doc/links_cal/*
+
+	dosym links /usr/bin/links2
+}
+
+pkg_postinst() {
+	if use svga; then
+		elog "You had the svga USE flag enabled, but for security reasons"
+		elog "the links2 binary is NOT setuid by default. In order to"
+		elog "enable links2 to work in SVGA, please change the permissions"
+		elog "of /usr/bin/links2 to enable suid."
+	fi
+}