Update to eapi4. Add switch for static libs. Punt .la files.

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

diff --git a/media-libs/silgraphite/ChangeLog b/media-libs/silgraphite/ChangeLog
index ef883c81be473d72d18f5bc4b8f1184fbedab321..d4d22764a4806efb22637d5d798930f330f65d65 100644 (file)
--- a/media-libs/silgraphite/ChangeLog
+++ b/media-libs/silgraphite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/silgraphite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/silgraphite/ChangeLog,v 1.18 2011/08/09 21:39:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/silgraphite/ChangeLog,v 1.19 2011/08/11 08:55:35 scarabeus Exp $
+
+  11 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  silgraphite-2.3.1.ebuild:
+  Update to eapi4. Add switch for static libs. Punt .la files.
 
   09 Aug 2011; Markos Chandras <hwoarang@gentoo.org> silgraphite-2.3.1.ebuild:
   Stable on amd64 wrt bug #355085

diff --git a/media-libs/silgraphite/Manifest b/media-libs/silgraphite/Manifest
index 2727382571e8eebb1dc6cfb500ac6716ab4e7b91..af927136682f9bafd9f2bc69a1b9a2e1dd78ae7f 100644 (file)
--- a/media-libs/silgraphite/Manifest
+++ b/media-libs/silgraphite/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX silgraphite-2.3.1-aligned_access.patch 2127 RMD160 3fc73016466090c309c560d804fe1d631982bef8 SHA1 86a47c0bcf8d72aae1e1f03e85ab2f968c96326e SHA256 6a995237dce8fd8848b965bf9d5ab653025f0be23ab86e08ea4639b49526dc1b
 DIST silgraphite-2.3.1.tar.gz 3239482 RMD160 baaf57ff95622bff9fc3908ae55872789eab5836 SHA1 fffd16e1aa24ff0afdc39aaf534323e23d5b8464 SHA256 9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65
-EBUILD silgraphite-2.3.1.ebuild 1106 RMD160 9a529779995b619534d34753b75ba146b9baf3d1 SHA1 41b2d129a00997681063d2fa3bb0ce7986c42b46 SHA256 adb5ecb5369e529a74950f855ce87d9417a4e1d225e1d918948e9f21838e3978
-MISC ChangeLog 2255 RMD160 359c061798f4f004eb7b1ebc8c0148cb785509cf SHA1 a431cf44ab963894cd8ae9ec3aacbf1f29d54d93 SHA256 b7086b6b82a7f384df39bdc1e70992002d8f31319e0a7b28c4a30e3cfcc94f6c
+EBUILD silgraphite-2.3.1.ebuild 1158 RMD160 fd6004ab9a1af950600fe374924579246e1cdb5f SHA1 66612b9cd139d33a067bc866debf61a9d5b0a839 SHA256 b98f75f7c66c86a1c85d221d12ef9a62de75922a322ea66c41f0204883bbcb8f
+MISC ChangeLog 2403 RMD160 383f32fc949e973010225db7df6c37b91cc97ab2 SHA1 c334a68c2c29b85934ea584dc3815e017531f0d9 SHA256 64acd0724d770a72fad8e21e731771240a1c14d9fd66cb7309fc0e6bd3c91226
 MISC metadata.xml 237 RMD160 d7819e84b80a048874f8516ed3af01aa44422e2a SHA1 7f3e2a809f6b0150dba63309cbe910a1d4213bab SHA256 cd2ca1a5bd2e81b16bd6d82c5ca8644118af9142c635ff77354b898b9f66444d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOQajXAAoJEPqDWhW0r/LCEzUP/25m2DwofdgrP0cbmMJUa3Ah
-XH9Uv/wEInrpWiizXPD2TFGtCKe6/YSzq5bjgrfAztlAkbbZtyLgKIAM27aNB29X
-2kzfD6UMCSaCTltjA5fGA2TiRq2yKoGE9XMmxDLwTJl4WU7OiO9OjmBY0UZUUh1G
-z1ZTHDNS3NB5yUv7/8K4LptmKAKo0oE57S9XXKV4GO9u0TDHv9o43WyNUfu6YOaS
-DlfIXraaCRhpShqF6PF4g6bC/RXaybREhbXcn62HWvWTHfM4UhKf7/58WQSINA90
-1pryGnwZM745p275CxqnkVZps+FVyuyo/P9WlTngOD3fijjQMQTmzVtBQBk0EnNK
-e6V67WjyZs4gXOSIcxQHfcoBQ7N7IfvHasLKm9+R5Hf4OM0HQJ8AKeJJmaNtfm9A
-UHvfX/tQ07mfOmcYHpNHmVSDXJrpR2sxCxBOxjk8lLaGo6/hZHA59WWO4u5gPqk7
-6rDL8oGUZAJFV6FN2baDwr4+whzUKRFRHC3LtSGjF+GwDCh1OdndzTGfQARPodqP
-PjLtYmSLfxTrUa/hg/DU2DeBwVR20dQD4Z3pK1aYIT9qCS0bSj95jc0L3hieG9+M
-3erqJYja64FvgT0EPuRgv6vhRXBoCx08bsnqIRuzWeYHBg0sLLBch93l39j9pw4g
-5FzzLFgjum5fa1GghL6p
-=Z9Tc
+iEYEARECAAYFAk5DmRIACgkQHB6c3gNBRYdbpgCeMo4P2hYZORxrFlWRPBW+fnwi
+QukAn3dm4Nz70m+VrR/3fmoHtFlSCwSh
+=7+hT
 -----END PGP SIGNATURE-----

diff --git a/media-libs/silgraphite/silgraphite-2.3.1.ebuild b/media-libs/silgraphite/silgraphite-2.3.1.ebuild
index 6fb2def9c0c785e31f4ddf7224073881c55979b5..8954f846bb116ca7f70b2d8f153bac94ab8975b8 100644 (file)
--- a/media-libs/silgraphite/silgraphite-2.3.1.ebuild
+++ b/media-libs/silgraphite/silgraphite-2.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/silgraphite/silgraphite-2.3.1.ebuild,v 1.18 2011/08/09 21:39:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/silgraphite/silgraphite-2.3.1.ebuild,v 1.19 2011/08/11 08:55:35 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils
 
@@ -13,11 +13,12 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pango truetype xft"
+IUSE="pango static-libs truetype xft"
 
-RDEPEND="xft? ( x11-libs/libXft )
+RDEPEND="
+       pango? ( x11-libs/pango media-libs/fontconfig )
        truetype? ( media-libs/freetype:2 )
-       pango? ( x11-libs/pango media-libs/fontconfig )"
+       xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
@@ -27,12 +28,13 @@ src_prepare() {
 
 src_configure() {
        econf \
+               $(use_enable static-libs static) \
                $(use_with xft) \
                $(use_with truetype freetype) \
                $(use_with pango pangographite)
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc README
+       default
+       find "${ED}" -name '*.la' -exec rm -f {} +
 }