Punt overshadowed versions, make static libs optional.

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

diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog
index 3d1f16e7decb2d285f14eb611186c90b04dd2c30..2c0c99a206bb31be7fbc11388e2d885f15a5ca6b 100644 (file)
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/fribidi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.42 2011/10/14 15:59:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.43 2011/10/23 11:27:36 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> -fribidi-0.10.9.ebuild,
+  -fribidi-0.19.1.ebuild, -fribidi-0.19.2.ebuild, fribidi-0.19.2-r1.ebuild,
+  -files/fribidi-macos.patch:
+  Punt overshadowed versions, make static libs optional.
 
   14 Oct 2011; Steve Dibb <beandog@gentoo.org> fribidi-0.19.2-r1.ebuild:
   amd64 stable, bug 385239

diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index a24be0a1a5114ad98a4de0296905498c873a246b..1540178251fe922967a7512b5432bd82a35714ad 100644 (file)
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,14 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fribidi-0.19.2-glib.patch 494 RMD160 21aa69bbcae00a0f5bba8898c5d41817b386953c SHA1 ad17f5784ca4ba24504f09c486272a8d91eab79e SHA256 9d5e0434d9ef50d866bb855f9db55840c9e4dfad50af404ef317effa24c416aa
 AUX fribidi-0.19.2-nodoc.patch 433 RMD160 a2698be86dcb59c403a25b7ae814bc97f0b391b0 SHA1 bd14fbf14ffecc70dc29f416117ae65096f5e76b SHA256 d87929d513ccb3da70b05be956e8d26451f7e9890f248cf20ea1e7d895fe60ca
-AUX fribidi-macos.patch 437 RMD160 f390024a41d7907d669d851ff7862e3f1bda3344 SHA1 598eb1b031d0167da52b0a25d54363ad61b3c338 SHA256 c707797eda69f8842eecf2722db59ece4c8ddd6730079f5db6c14c03065727c0
 DIST fribidi-0.10.7.tar.gz 593309 RMD160 ddc37838a1cca880a7c63c0e77cff5ed7a3fac1d SHA1 b49568f87d72a1f513e533a99bf0143dc9fc3e64 SHA256 ecea548c16f5632f0d5dbc005e595bf2f4ebfbdb0bf74c8db347662f8475450b
-DIST fribidi-0.10.9.tar.gz 621563 RMD160 31495fecd4318f9bd6217b015f65a936389c3204 SHA1 f9aae2d2084eaccbc87760401c4521e96a92a436 SHA256 b8fc7592f50bdac2182e9105e19fe54329faab35edbcf1bc66bde2e7174f87b4
-DIST fribidi-0.19.1.tar.gz 681447 RMD160 1c1b6b751f9c182a37efec32c50a460faa06814d SHA1 94ed54d597cf5f3dd1690857f7a2f604c4b7dee3 SHA256 62788b37f288ad41b54a506d489beb4f98c134cde441bd8bbcd67baef0bc31c8
 DIST fribidi-0.19.2.tar.gz 668933 RMD160 4fafb4b3140bbbcf4c2c58c714b02db2d71e5491 SHA1 3889469d96dbca3d8522231672e14cca77de4d5e SHA256 49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
 EBUILD fribidi-0.10.7.ebuild 597 RMD160 27b8f9d61d7128b699c55e3876fac72206de66fb SHA1 e6cb30f0a6d4e0391eeae5fca8b3b988ab3e9cd6 SHA256 4dc33d493e6d02a2bdb7bbf9105f37c67b7d9624100b35f014fa65e400d2e607
-EBUILD fribidi-0.10.9.ebuild 607 RMD160 758847aeb227711d34d36e162ca931204ac595f6 SHA1 c3e222af4ead7a96c535165d3ed717f33fb7679f SHA256 d6cab50e75a793ef8ac45758a0aaa2afc23fc6975dea00703fd9c9b036b6ccda
-EBUILD fribidi-0.19.1.ebuild 665 RMD160 18ea471a1253a3ca44f3650f788871bb9beaef42 SHA1 7994fff5cc1e8573974343618d8d236987a48bb3 SHA256 82b63ec9917e897caca3b8fe2679da85401a3160d2ef72c76f3a567ca092c78f
-EBUILD fribidi-0.19.2-r1.ebuild 908 RMD160 262099fddee3efd91d364aef4880e9819b0d2e8a SHA1 cd79cf194cb945a485abf6f14ccf9a79bf05e247 SHA256 ddcbe019f06b103d2bf88dc8b005b1c07a2d55c10c753e1784015fdb46ae0872
-EBUILD fribidi-0.19.2.ebuild 666 RMD160 cafeb636f655d19fe1558ed7dda809a6bcb2b33a SHA1 c775633e44d302f9a188c246d03c09d9ed8085ed SHA256 9c0fb5cbb1116724799af77af60f79a572bffaab25ae70503eb371d9f9146bb4
-MISC ChangeLog 5632 RMD160 4a325c175ac3b7bb86d6b8bba8938c4f795648cb SHA1 783d8fd22697e1bbd8acdd1bf71a3b0df230e187 SHA256 a47b75c73039670442b9432d7ec9ef5ea7f4f727ea836631daa0228b10c373be
+EBUILD fribidi-0.19.2-r1.ebuild 997 RMD160 33b130615664772bc21b5e797b602d4d8945995e SHA1 b4b083928984232fe6bc023637b1c41fa9fa890f SHA256 c5e6c2241b7e17d58267d8d01b1d6abdd2d6748d1175bdee09cabf8bfbd5d294
+MISC ChangeLog 5877 RMD160 3acf8b07359d32b138dba90ecc93c6a23a4d5858 SHA1 94d6c8ba3a828c01fbf6cbcb38cd745fcb26c563 SHA256 c5093afb62abc1da79ab52d258811a483540f80c327d3a4a113bf4d54801d90a
 MISC metadata.xml 206 RMD160 83ccfb8760990aa9505ff3fc783b007757a28b8f SHA1 751236ca8239ebc0f626ebaec962c541d06a08dc SHA256 ad4b3a76027f2a686de5578c6b1251011dd917a10fcf9fd8d16105b35c2f991b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOo/nZAAoJEOSiRoyO7jvotpIQALLhDkrWkLL4Rr6ckTjZXy2p
+BF8IiK4LQXECiNAlCZ7sKTjbvkucY/ZV65on8H4jAVPRpPejG01Ty2wWqDRl+cwt
+4c2ORXdD+4L2LiY/oiTWypAvD+hJckKD7srZGDmx5qvXJxGyZ8VvJ4HFBJzDuYiq
+jdBb8cgR2QYUIRGybHEWPXp90CahQ0P0krWPkhbxvVZ4ifTPqFbELUgYnaxjU6Jf
+QGcu/7JMUbvcF5EuN0xVdBmNziKr5csTUtODNypIbOqODN1upvguydeV4xmTyFxW
+izD8VYRwYb37reJBtMeNXMcQKH8LhN828rJOPNJBTPv6q45k0hWmvBAUMZ8ZJ7pP
+Aq/sQjezNaWk7WKtRnw8TkKJC71mJ79TxoRzjlv/+6JAiyHmW2YTXIChqkGYzoNe
+UwxZHt5Ow3iruJ9oIQhCkiDKlpXvLWL3j/57gL9K70nAsP1qqdKaPYA0+bDex08c
+SCN+Z2eDjJE3cYkrNM7MhMuoc0+OEjhmjxDfa4mq1BdXBi8Pl5Mrt5Iki2kd1h1+
+1GeycuZjev6mX2uG9xMcITluA0SZMlLY1v1+VxAmMwsaYRnBaH4XU6r+xAdNwUzy
+tz+zc0SR8X+MaNJx3nMsiHa6B5NBSJgg/xQJ3bRubxfpBw4btv8CQybIeqxHBZ2g
+T67Ltk9wXUpeOFN1fFoi
+=oEx1
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/fribidi/files/fribidi-macos.patch b/dev-libs/fribidi/files/fribidi-macos.patch
deleted file mode 100644 (file)
index 1fe8c97..0000000
--- a/dev-libs/fribidi/files/fribidi-macos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fribidi-0.10.4/configure.orig      Sat Feb 12 20:27:25 2005
-+++ fribidi-0.10.4/configure   Sat Feb 12 20:28:08 2005
-@@ -3539,7 +3539,7 @@
-     ;;
- 
-   darwin* | rhapsody*)
--    allow_undefined_flag='-undefined suppress'
-+    allow_undefined_flag=''
-     # FIXME: Relying on posixy $() will cause problems for
-     #        cross-compilation, but unfortunately the echo tests do not
-     #        yet detect zsh echo's removal of \ escapes.

diff --git a/dev-libs/fribidi/fribidi-0.10.9.ebuild b/dev-libs/fribidi/fribidi-0.10.9.ebuild
deleted file mode 100644 (file)
index 3e88530..0000000
--- a/dev-libs/fribidi/fribidi-0.10.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.10.9.ebuild,v 1.3 2009/04/05 20:59:37 loki_val Exp $
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="http://fribidi.org/"
-SRC_URI="http://fribidi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc AUTHORS NEWS README ChangeLog THANKS TODO
-}

diff --git a/dev-libs/fribidi/fribidi-0.19.1.ebuild b/dev-libs/fribidi/fribidi-0.19.1.ebuild
deleted file mode 100644 (file)
index ee35ab8..0000000
--- a/dev-libs/fribidi/fribidi-0.19.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.1.ebuild,v 1.4 2010/01/14 21:22:55 fauli Exp $
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="http://fribidi.org/"
-SRC_URI="http://fribidi.org/download/${P}.tar.gz"
-
-LICENSE="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-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc AUTHORS NEWS README ChangeLog THANKS TODO
-}

diff --git a/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild
index ef66b9c69333838a44eca3faf21ea23cee8843bc..312bb145a0f9843359b1312b5fcc9df400bc21ff 100644 (file)
--- a/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild,v 1.2 2011/10/14 15:59:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild,v 1.3 2011/10/23 11:27:36 scarabeus Exp $
+
+EAPI=4
 
-EAPI="2"
 inherit autotools eutils
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
@@ -12,12 +13,14 @@ SRC_URI="http://fribidi.org/download/${P}.tar.gz"
 LICENSE="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-solaris ~x86-solaris"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.4:2"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
+DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
+
 src_prepare() {
        # bug #318569
        epatch "${FILESDIR}/${P}-glib.patch"
@@ -25,7 +28,12 @@ src_prepare() {
        eautoreconf
 }
 
+src_configure() {
+       econf \
+               $(use_enable static-libs static)
+}
+
 src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc AUTHORS NEWS README ChangeLog THANKS TODO || die
+       default
+       find "${ED}" -name '*.la' -exec rm -f {} +
 }

diff --git a/dev-libs/fribidi/fribidi-0.19.2.ebuild b/dev-libs/fribidi/fribidi-0.19.2.ebuild
deleted file mode 100644 (file)
index ddd2d34..0000000
--- a/dev-libs/fribidi/fribidi-0.19.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.2.ebuild,v 1.2 2011/10/14 15:53:58 beandog Exp $
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="http://fribidi.org/"
-SRC_URI="http://fribidi.org/download/${P}.tar.gz"
-
-LICENSE="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-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc AUTHORS NEWS README ChangeLog THANKS TODO
-}