diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-23 11:27:36 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-23 11:27:36 +0000 |
commit | d93b623d8b6890b44f8dfdaef0aee57abba23239 (patch) | |
tree | a0c3550a50ced75fe187470b8999c2f748ec9f65 /dev-libs | |
parent | Do not install libtool archive and static library unconditionaly. (diff) | |
download | gentoo-2-d93b623d8b6890b44f8dfdaef0aee57abba23239.tar.gz gentoo-2-d93b623d8b6890b44f8dfdaef0aee57abba23239.tar.bz2 gentoo-2-d93b623d8b6890b44f8dfdaef0aee57abba23239.zip |
Punt overshadowed versions, make static libs optional.
(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/fribidi/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/fribidi/files/fribidi-macos.patch | 11 | ||||
-rw-r--r-- | dev-libs/fribidi/fribidi-0.10.9.ebuild | 17 | ||||
-rw-r--r-- | dev-libs/fribidi/fribidi-0.19.1.ebuild | 17 | ||||
-rw-r--r-- | dev-libs/fribidi/fribidi-0.19.2-r1.ebuild | 18 | ||||
-rw-r--r-- | dev-libs/fribidi/fribidi-0.19.2.ebuild | 17 |
6 files changed, 19 insertions, 68 deletions
diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog index 3d1f16e7decb..2c0c99a206bb 100644 --- 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/files/fribidi-macos.patch b/dev-libs/fribidi/files/fribidi-macos.patch deleted file mode 100644 index 1fe8c97b48b4..000000000000 --- 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 index 3e8853053c8e..000000000000 --- 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 index ee35ab8b586f..000000000000 --- 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 ef66b9c69333..312bb145a0f9 100644 --- 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 index ddd2d34b16e8..000000000000 --- 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 -} |