Fixes for prefix and keyworded for ~-linux

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 9d78f277aa7e37b62bd7ea8cefda0f7b9b005fa7..3b7adc99f0f0a5408b63b3405e93e43dd9e00d50 100644 (file)
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX eog-2.30.1-libjpeg-configure.patch 1002 RMD160 0a4b73a2a0128cb61287e9c8896b018925a453c8 SHA1 812433d6b10b144b1b1478267bd89477dd8f4eb8 SHA256 cbb362baaf0681772f3a2d3aac27fcd4787ebf82342d1e03e5d24dc250d0cb19
 DIST eog-2.26.3.tar.bz2 2446417 RMD160 53710759e71a304789eaaeeddefa56ac80af8494 SHA1 dce3dc99d3df80bcfad1401bd6efdcd7dfc88e30 SHA256 67889e7598263146d835bce277df0dd67b6c5a14ad963790ce09ced55897effe
 DIST eog-2.28.2.tar.bz2 2675876 RMD160 d7ff35ade45770b77c66e99f9190147244fe6b02 SHA1 26eda3778adf9e836f18d1b45f4cfd5bb9fd2674 SHA256 9d7ec3f8a94f5fdc051d9ee5dc5f4f8e46d83b44d9b0a40d68beaaa738a91a08
+DIST eog-2.30.1.tar.bz2 2691413 RMD160 f0728289d3f142634133c00fa15dbaa3c40a6213 SHA1 ffc003975ad1c39fca5de1a1c1bb15027bc244af SHA256 d245d96d791c88197dda1f667c196cb4134f9ce88596e696d5fbcddb6747ecf6
 EBUILD eog-2.26.3.ebuild 1834 RMD160 a509792e78bc8622f624c45e5039f17b1ec23d11 SHA1 1884756beac92607d01063d3b51421abeaaf6071 SHA256 408d7791e8095c0f02e13b13d9396bb3c01432cfd40e8c461e749a17711f38ae
 EBUILD eog-2.28.2.ebuild 1976 RMD160 dc07c809cad14da607a2645ed5ecfdc11a743660 SHA1 c12a8d590383eb11789721737fbd095fd222d2a3 SHA256 ad7d66ed8e5daeb40b089ffbb67f0de43c28e10300d662d783f1ca98524d0451
-MISC ChangeLog 30531 RMD160 ef17248cbfb85b481918a5f1420e879e34aa51ef SHA1 49cf7b146b183ebb44003cfba8904d5c7929e9b1 SHA256 311da440b21f4848c77e6f6849c87486237ef3587d197ec49220d749b9543e33
+EBUILD eog-2.30.1.ebuild 1645 RMD160 3491dd427c92cf717788c90ddc292a299a8deb41 SHA1 2d98b794d5ffd812f7dddd9557dc0b8173e7b06b SHA256 cb5621d0d67f384f5396fc9d092b98f717dae0e92dfd33f86cd85a097fd394f3
+MISC ChangeLog 30856 RMD160 55ada72b09790f50b44e8de923a68fa28cecc527 SHA1 9d75431bb6d0273b1c11f382c8af4dd8d1a8162e SHA256 763bace520e96d842142498dbcb3f3c39dad401afbcee0a95abe363a693170bc
 MISC metadata.xml 377 RMD160 72d273853415be617a9d9041a8e976471f5d5d0e SHA1 31212db654340d26addb59e4f5ecdeeaa08e4d06 SHA256 d51779b821ec7ef34d3c040683f4373de52797e453cf90e490343eee3230367f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJY3sACgkQkKaRLQcq0GKwbwCgk29Cw7mSWPMg6nHNSJ7qsdm2
-2PoAmweevBS1kno5zkBvgM8GUcR4y0D0
-=npF9
+iEYEARECAAYFAkwXp1QACgkQCaWpQKGI+9TBpwCeIlcIQ9XTWiamJRrRlAqGpPfs
+yAgAnjJtr5B90LTD2kgzsHy1+t2BHAgm
+=IoAw
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2c5ce4303d310629a7b7915fcc82b776475a70b1..922724640b37eb804001f6e898032a3a0877f7a5 100644 (file)
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST graphviz-2.26.0.tar.gz 16946980 RMD160 58af87cca486fb8aa42cef6d5a77cbb68af76607 SHA1 e78d93f62738b978d41641a05cc453b7edaa8398 SHA256 2f37344050de50e28dd04a625ae32f881542586ff20209e342ce17969f680691
 DIST graphviz-2.26.3.tar.gz 17092429 RMD160 b2fbaf03b2006b43ed70e2a710363d7efbcfda77 SHA1 04503ac5a9eaa579859f0d017811fa245717edec SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1
 EBUILD graphviz-2.26.0.ebuild 5762 RMD160 200f2de29af87851e93d1b15e31a43b026c62b41 SHA1 c561728cb021843c6a8dca47210c6aafb40d1f7a SHA256 8a3c0dd87f373b1a274217c42bfc9950147f573ba39cb1768b93a01922f12fa8
-EBUILD graphviz-2.26.3-r1.ebuild 5919 RMD160 6dffcdae806f54a2f73fec61101168e65d2aba6c SHA1 400a97f005825efa93fad47c5db415412e45a9da SHA256 a164339e1d466d2c5568bf3e6c0fe6a9dfaabb3342a6dbce6e47a4e83258a402
+EBUILD graphviz-2.26.3-r1.ebuild 6024 RMD160 ccef4fa284f5f07f71ffafb2a496529970d7757d SHA1 4737229ef058b77fd4ed9955169ad90ecbfa59c0 SHA256 e4a37ed736b2cd8996fcc05c8ffee74b7d298aa7fdd82c375926d0d208fdfb43
 EBUILD graphviz-2.26.3.ebuild 5773 RMD160 730daf5185eb3fe05a585f3eb33a726f2a806a00 SHA1 c337596455b9cf1f20a8c23c0953a66c44c40212 SHA256 8fa271fa70374352a35340279b589e8717cf832b2b295084ce055d15e0f9e719
 MISC ChangeLog 32266 RMD160 40687edf5ce5ec77a7fa0522daeb381bfa33d0a4 SHA1 d17e68b24ed84c936dee7f5dfb8591c54faf32cb SHA256 4bab768bccd1607b532e51c05450a78022a77bd45311e5d3b87f71d8210662b9
 MISC metadata.xml 1649 RMD160 e2238f2d7f945b9d05aa7cea65ed3a5b4f635251 SHA1 68476203394f16fd247976409d614596138431db SHA256 1d35d9b4fbceffa67229a5e0fcf3537f77bf05e00fbdb5ec0c3c82c4c845cc2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwXpoMACgkQgAnW8HDreRbb0QCcDsKUZYFLbXsacEWGXSf7A4ly
+K1MAoKAsIxYNMvO+qtpAY1NHPlm9UdKY
+=sVyy
+-----END PGP SIGNATURE-----

diff --git a/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild
index 2b5ecff581bde679360624ca7b626fea20a8c3eb..baf9b12bbaf4e82f7895d286a5495bb2f74a624f 100644 (file)
--- a/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild,v 1.2 2010/05/22 19:26:13 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild,v 1.3 2010/06/15 16:12:46 jlec Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils autotools multilib python
 
 DESCRIPTION="Open Source Graph Visualization Software"
@@ -11,7 +11,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cairo doc examples gtk java lasi nls perl python ruby static-libs tcl"
 
 # Requires ksh
@@ -112,9 +112,9 @@ src_prepare() {
        # Update this file from our local libtool which is much newer than the
        # bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD.
        if has_version ">=sys-devel/libtool-2" ; then
-               cp /usr/share/libtool/config/install-sh config || die
+               cp "${EPREFIX}"/usr/share/libtool/config/install-sh config || die
        else
-               cp /usr/share/libtool/install-sh config || die
+               cp "${EPREFIX}"/usr/share/libtool/install-sh config || die
        fi
 
        # no nls, no gettext, no iconv macro, so disable it
@@ -186,17 +186,17 @@ src_install() {
        sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
 
        emake DESTDIR="${D}" \
-               txtdir=/usr/share/doc/${PF} \
-               htmldir=/usr/share/doc/${PF}/html \
-               htmlinfodir=/usr/share/doc/${PF}/html/info \
-               pdfdir=/usr/share/doc/${PF}/pdf \
-               pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+               txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+               htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+               pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+               pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
                install || die "emake install failed"
 
        use examples || rm -rf "${D}/usr/share/graphviz/demo"
 
        if ! use static-libs; then
-               find "${D}"/usr/$(get_libdir)/ -name '*.la' -delete || die
+               find "${ED}"/usr/$(get_libdir)/ -name '*.la' -delete || die
        fi
 
        dodoc AUTHORS ChangeLog NEWS README