From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 9 Oct 2005 11:52:22 +0000 (+0000)
Subject: Removing conditional patching + fixes for ppc-macos
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65ce7cd3950c2faf44bca12c2bca616360b7dfeb;p=gentoo.git

Removing conditional patching + fixes for ppc-macos
Package-Manager: portage-2.0.51.22-r2
---

diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog
index 0119a72f12bd..40d2d2f5a724 100644
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/fribidi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.18 2005/09/22 13:45:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.19 2005/10/09 11:52:22 grobian Exp $
+
+  09 Oct 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/fribidi-0.10.5-darwin.patch, fribidi-0.10.4.ebuild,
+  fribidi-0.10.5.ebuild:
+  - Removing conditional patching for ppc-macos
+  - Fixing patch for 0.10.5
+  - Fixing libtool/compilation for 0.10.5 on OSX
+  - Removing ANNOUNCE from doc on 0.10.5 as dodoc complains it cannot find it
 
 *fribidi-0.10.5 (22 Sep 2005)
 
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 6355f6d3cf5a..c8036c0fbb13 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,7 +1,8 @@
-MD5 f5e6f85218f7692ecee87c9b17f69b19 fribidi-0.10.4.ebuild 827
-MD5 de1d41488d11d5de6690390c520de64a ChangeLog 2320
-MD5 334219be8abd5f08e7c5548bd41017aa fribidi-0.10.5.ebuild 815
+MD5 2f25089e4cdb7f083d0797a5f1093de9 fribidi-0.10.4.ebuild 811
+MD5 91d13eb5ec82107f33340864d37433c6 ChangeLog 2662
+MD5 1eda7fbdb4b72a2056a359ce32548092 fribidi-0.10.5.ebuild 813
 MD5 9cf27d810e5266f1790cc19be2845747 metadata.xml 228
+MD5 987f5f0968bd4cfe9fe788dd78cf734c files/fribidi-0.10.5-darwin.patch 459
 MD5 40046ccf090ce4962be3ac75a4329013 files/fribidi-macos.patch 437
 MD5 9a610e878fe5f7a2a3e5a855a54b41a5 files/digest-fribidi-0.10.4 67
 MD5 4357156c0cae180a994311c435a82ac9 files/digest-fribidi-0.10.5 66
diff --git a/dev-libs/fribidi/files/fribidi-0.10.5-darwin.patch b/dev-libs/fribidi/files/fribidi-0.10.5-darwin.patch
new file mode 100644
index 000000000000..f1fe8a132214
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.10.5-darwin.patch
@@ -0,0 +1,11 @@
+--- fribidi-0.10.5/configure.orig	2005-10-09 13:38:30.000000000 +0200
++++ fribidi-0.10.5/configure	2005-10-09 13:39:27.000000000 +0200
+@@ -6076,7 +6076,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.4.ebuild b/dev-libs/fribidi/fribidi-0.10.4.ebuild
index 703d093d7e18..c0eef8fbb42a 100644
--- a/dev-libs/fribidi/fribidi-0.10.4.ebuild
+++ b/dev-libs/fribidi/fribidi-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.10.4.ebuild,v 1.21 2005/07/09 01:28:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.10.4.ebuild,v 1.22 2005/10/09 11:52:22 grobian Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	use ppc-macos && epatch ${FILESDIR}/${PN}-macos.patch
+	epatch ${FILESDIR}/${PN}-macos.patch
 }
 
 src_compile() {
diff --git a/dev-libs/fribidi/fribidi-0.10.5.ebuild b/dev-libs/fribidi/fribidi-0.10.5.ebuild
index 1b92da778e6d..99937c2feea7 100644
--- a/dev-libs/fribidi/fribidi-0.10.5.ebuild
+++ b/dev-libs/fribidi/fribidi-0.10.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.10.5.ebuild,v 1.1 2005/09/22 13:45:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.10.5.ebuild,v 1.2 2005/10/09 11:52:22 grobian Exp $
 
-inherit eutils
+inherit eutils libtool
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="http://fribidi.org/"
@@ -17,7 +17,8 @@ DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	use ppc-macos && epatch ${FILESDIR}/${PN}-macos.patch
+	epatch "${FILESDIR}/${P}"-darwin.patch
+	elibtoolize
 }
 
 src_compile() {
@@ -28,5 +29,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS NEWS README ChangeLog THANKS TODO ANNOUNCE
+	dodoc AUTHORS NEWS README ChangeLog THANKS TODO
 }