Fix underlinking with libX11 (--enable-forte), bug 369003 by Diego Elio Pettenò. Drop old.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 11 insertions, 63 deletions

diff --git a/net-print/gtklp/ChangeLog b/net-print/gtklp/ChangeLog
index 8d835994e35d..4a1c2401c383 100644
--- a/net-print/gtklp/ChangeLog
+++ b/net-print/gtklp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/gtklp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/ChangeLog,v 1.41 2011/03/29 08:05:09 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/ChangeLog,v 1.42 2011/06/20 10:54:00 pva Exp $
+
+  20 Jun 2011; Peter Volkov <pva@gentoo.org> -gtklp-1.2.7.ebuild,
+  gtklp-1.2.8.ebuild:
+  Fix underlinking with libX11 (--enable-forte), bug 369003 by Diego Elio
+  Pettenò. Drop old.
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> gtklp-1.2.7.ebuild,
   gtklp-1.2.8.ebuild:
diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest
index 19e366f38261..9614f9ebac37 100644
--- a/net-print/gtklp/Manifest
+++ b/net-print/gtklp/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST gtklp-1.2.7.src.tar.gz 739871 RMD160 24aae020912b03565a7fccb317b9dab72ade2d51 SHA1 fa7fc0901016bb035d0fdf56e0984bf9728af1d4 SHA256 6798abf8ed59ad874bd4703f3feb18a6f85c796e610da5fdbf576f3593b3c5a4
 DIST gtklp-1.2.8.src.tar.gz 743764 RMD160 4f687e4e2f0c7bd7a49abeef7c63609b77b048c6 SHA1 a881cc8705dcc96bba806929679b5392fb20c72d SHA256 c765ff40728342a0531ac3f8ed5942fbaf143cee9a66a7300a0141ada9966c86
 DIST gtklp-logo.xpm.gz 2254 RMD160 50c6579a247fbed3578e969cd706a3fe32170354 SHA1 eea151f7356ef57bba9f2d4c90630a2d1f15d518 SHA256 cb5292aa0b866a39a1d0719c52e46b33241d640c237396b31037ad0aa1353886
-EBUILD gtklp-1.2.7.ebuild 1264 RMD160 137a589abe18d7fe5c5bbfb2ae91d63e0b311392 SHA1 e1166229053778dcbe8bd498f746dc3480d27edf SHA256 5cb1ed6d6c6af0f275998816c1664d8eae11218dc18f1c3541db490b171ea27d
-EBUILD gtklp-1.2.8.ebuild 1264 RMD160 c82a21cb895428978af858a45e9065a9422392f3 SHA1 efab88a90ff13b651f43f055a1dac4ad10baf47e SHA256 c50784af5b223d0a4c0a5c9a49d3631c4649f885218cec44a32e3afcffac01f4
-MISC ChangeLog 5523 RMD160 067043e7f9df4d38d14750da1903af86a254986f SHA1 5b5ff2ac341d757fc665baa17cbf3456017dd091 SHA256 21c3a8c1970d15c53f8898997c85e63cf1bd3f3b3d365ea1215f973ab7c82c0e
+EBUILD gtklp-1.2.8.ebuild 1287 RMD160 c58259502d3964e4105bed32b5f152d8ae67937d SHA1 6d9bca10b16c4f5d8238445c25423aabee4a268f SHA256 77fbad7bc69ed310ca190a2b7dd41def68d7df393b0774c4e6cc573ecbd87142
+MISC ChangeLog 5704 RMD160 c0cf92c8f4dd0a9e7efc77536e8f3023156ead6b SHA1 580ce7e3dfd6fc9dd45b8ab999620b2755fd997d SHA256 eb46874d77eb8eb3ef5f95a416e951cda97e90b36d11e023a802163288376d3b
 MISC metadata.xml 538 RMD160 5bfb17eaa8a226f45d20dddda5a1c8ae1bb1c9d6 SHA1 0d416d601bacafe49a5bb797c65f4f56c971dddb SHA256 c1ffa4dd06b6e031d1c2acfea0997a0b929f7807cd814bc49e5b14690698a419
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2RkrsACgkQmWq1bYTyC0PMpgD/XZ4HkYMLt83UMANN/We1E4Ez
-gBYKzH2ByNsRxcdDC4UA+we5MfOQtnLc7zLeD/tFgCxjnLZxQTjDLlvQ1bBSTr/+
-=Nxku
------END PGP SIGNATURE-----
diff --git a/net-print/gtklp/gtklp-1.2.7.ebuild b/net-print/gtklp/gtklp-1.2.7.ebuild
deleted file mode 100644
index 740bca2c6e03..000000000000
--- a/net-print/gtklp/gtklp-1.2.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.2.7.ebuild,v 1.5 2011/03/29 08:05:10 angelos Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A GUI for cupsd"
-HOMEPAGE="http://gtklp.sourceforge.net"
-SRC_URI="mirror://sourceforge/gtklp/${P}.src.tar.gz
-	mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="nls ssl"
-
-RDEPEND="x11-libs/gtk+:2
-	>=net-print/cups-1.1.12
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	sed -e '/DEF_BROWSER_CMD/{s:netscape:firefox:}' \
-		-e '/DEF_HELP_HOME/{s:631/sum.html#STANDARD_OPTIONS:631/help/:}' \
-		-i include/defaults.h
-	eautoreconf # avoid "maintainer mode"
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ssl)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog README TODO USAGE || die
-
-	doicon "${WORKDIR}"/gtklp-logo.xpm
-	make_desktop_entry 'gtklp -i' "Print files via CUPS" gtklp-logo 'System;Printing'
-	make_desktop_entry gtklpq "CUPS queue manager" gtklp-logo 'System;Printing'
-}
diff --git a/net-print/gtklp/gtklp-1.2.8.ebuild b/net-print/gtklp/gtklp-1.2.8.ebuild
index 1a665033e376..0e6c528cd485 100644
--- a/net-print/gtklp/gtklp-1.2.8.ebuild
+++ b/net-print/gtklp/gtklp-1.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.2.8.ebuild,v 1.5 2011/03/29 08:05:09 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.2.8.ebuild,v 1.6 2011/06/20 10:54:00 pva Exp $
 
 EAPI="2"
 
@@ -33,7 +33,8 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable ssl)
+		$(use_enable ssl) \
+		--enable-forte #369003
 }
 
 src_install () {