From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Fri, 5 Aug 2011 20:58:18 +0000 (+0000)
Subject: Added static-libs. Simplified ebuild for EAPI4
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=daa56a6257d549c6e99ef41efe401f7e63ed8afc;p=gentoo.git

Added static-libs. Simplified ebuild for EAPI4

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

diff --git a/x11-libs/xpa/ChangeLog b/x11-libs/xpa/ChangeLog
index da10b4bc6569..639e95f74e1e 100644
--- a/x11-libs/xpa/ChangeLog
+++ b/x11-libs/xpa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/xpa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/ChangeLog,v 1.8 2011/05/03 17:25:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/ChangeLog,v 1.9 2011/08/05 20:58:18 bicatali Exp $
+
+  05 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> xpa-2.1.13.ebuild:
+  Added static-libs. Simplified ebuild for EAPI4
 
 *xpa-2.1.13 (03 May 2011)
 
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
index 9728e650aa85..90322ee15f29 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -5,13 +5,13 @@ AUX xpa-2.1.8-makefile.patch 2594 RMD160 5930d2488812dd0ea8d1201d6be27c3a41bacba
 DIST xpa-2.1.12.tar.gz 847851 RMD160 24d6e472cac785060fee506f25de4d4601cc292d SHA1 16a79488ba3c369ecdc24e052e39021e372e16c4 SHA256 ed85c2f85a689ab55766ec1aa2840a61f4d64e63b9b640ba690f13895520e4e8
 DIST xpa-2.1.13.tar.gz 853402 RMD160 b63411b0296665388528f654e13219d728bcd824 SHA1 d1feb5b437203dbfe67ff4fc56462acf2a8a1a49 SHA256 7e80790ac36d8007b7b352dc8efeccd19efe52c2bb216a571ae4e5aa80a8d311
 EBUILD xpa-2.1.12.ebuild 1327 RMD160 c7d4e3afc4c76d82fbcbf9e052ae6d0a01993c45 SHA1 b01aaa435588799d7e18b0db4368d2c69dde9329 SHA256 5398bfc499fde28652bf0825aa4077af0d2f7c5b839d73a1a458705d51f6cffe
-EBUILD xpa-2.1.13.ebuild 1297 RMD160 88052870da3d56af34684c0f0bade11f1e1cfd56 SHA1 91f9136be74eb4934bec25f171878a4a67621c65 SHA256 4b851bba94ab5b8b0e65474f1017030f801cdcc2a3c89965ee6d8cda624f78c0
-MISC ChangeLog 1341 RMD160 43b10fb6fca15cf6449019be0f9e66e6da393d5c SHA1 33e431c5d38590e6e861120ec2ce30a514919b3a SHA256 9784721b38ae28e8955be8c131fc16f015ff29409972636fb2553d47021b5ea5
+EBUILD xpa-2.1.13.ebuild 1347 RMD160 0db5f2caa1514ea7e798ace7541427d51e569b1f SHA1 13cee1297d892e2b1d5a6c9cc633e81b7bfbe797 SHA256 adb5f95c7962a12f10d2b3e68ce33515b85ae0d3941846f2d12c4530af4fbda1
+MISC ChangeLog 1469 RMD160 bf1c27ded3e0b03b6269d8a1d3f507eb6ee4ef2e SHA1 effe8cdc4b804c95296f224be23aaf3cdd8d63eb SHA256 0acd99e6272ab35e3faf1c0b08a94188ffb903f15e929d120b0996add5518662
 MISC metadata.xml 846 RMD160 c25b5cc0f87a08179f4459dd7154e125c75e4990 SHA1 7a41f6cd3f9aea1f8bdfdf627b9d08f4deb13201 SHA256 31c0bbbf8b65938a76a7df1b288a29ef0944cfb9706c2baae48c749953a7bf62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3AOn8ACgkQgAnW8HDreRZ3wQCdE83SM/wjDaJkg51fKrIi30Pl
-ltMAoKlo/UnJzUN61LfaAZQKEnpy70Pa
-=CJPW
+iEYEARECAAYFAk48WXQACgkQ1ycZbhPLE2CxCACfUP7QjMV/PWBqMDNhWVxd9uAO
+ry8AoLJbcYbRXBDvMUmm7lARHt8IB00C
+=JPEH
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xpa/xpa-2.1.13.ebuild b/x11-libs/xpa/xpa-2.1.13.ebuild
index 148c667fe9df..507be16e83a9 100644
--- a/x11-libs/xpa/xpa-2.1.13.ebuild
+++ b/x11-libs/xpa/xpa-2.1.13.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/x11-libs/xpa/xpa-2.1.13.ebuild,v 1.1 2011/05/03 17:25:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/xpa-2.1.13.ebuild,v 1.2 2011/08/05 20:58:18 bicatali Exp $
 
 EAPI=4
 
@@ -13,17 +13,16 @@ SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
+IUSE="doc static-libs"
 
-RDEPEND="
-	dev-lang/tcl
+RDEPEND="dev-lang/tcl
 	x11-libs/libXt
 	!<sci-astronomy/ds9-5.3"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
-	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib
+	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
 	eautoconf
 }
 
@@ -37,22 +36,19 @@ src_configure() {
 }
 
 src_compile() {
-	emake shlib tclxpa || die "emake failed"
+	emake shlib tclxpa
 }
 
 src_install () {
 	dodir /usr/$(get_libdir)
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake INSTALL_ROOT="${D}" install
 	insinto /usr/$(get_libdir)/tclxpa
 	doins pkgIndex.tcl
-	mv "${D}"/usr/$(get_libdir)/libtclxpa* "${D}"/usr/$(get_libdir)/tclxpa/
-
+	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
 	dodoc README
-	if use doc; then
-		cd doc
-		insinto /usr/share/doc/${PF}
-		doins *.pdf || die
-		insinto /usr/share/doc/${PF}/html
-		doins *.html || die
-	fi
+	use doc && dodoc doc/*.pdf && dohtml doc/*.html
+	# build system so crappy not worth patching to a non respondant upstream
+	# and builds static with PIC
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }