summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-07-18 04:45:14 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-07-18 04:45:14 +0000
commit0fe377986cfafe12581e22b73017777b2050c5fb (patch)
tree444dae081a28a8360449fde270532e7f4ba56f83
parentstable x86; bug #140656 (diff)
downloadhistorical-0fe377986cfafe12581e22b73017777b2050c5fb.tar.gz
historical-0fe377986cfafe12581e22b73017777b2050c5fb.tar.bz2
historical-0fe377986cfafe12581e22b73017777b2050c5fb.zip
Move the ppc-macos patch out of if, as it's needed on FreeBSD and does not hinder Linux builds, and export CC/LD or here it finds gcc unable to produce shared libraries.
Package-Manager: portage-2.1.1_pre3-r1
-rw-r--r--app-text/recode/ChangeLog7
-rw-r--r--app-text/recode/Manifest22
-rw-r--r--app-text/recode/recode-3.6-r2.ebuild13
3 files changed, 25 insertions, 17 deletions
diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index 13426bcb71ec..f235e9420e9f 100644
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/recode
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.34 2006/04/22 22:37:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.35 2006/07/18 04:45:14 flameeyes Exp $
+
+ 18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> recode-3.6-r2.ebuild:
+ Move the ppc-macos patch out of if, as it's needed on FreeBSD and does not
+ hinder Linux builds, and export CC/LD or here it finds gcc unable to produce
+ shared libraries.
22 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> recode-3.6-r2.ebuild:
Add ~x86-fbsd keyword.
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index cc59aa460cfc..99344d9851a8 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -15,14 +15,14 @@ EBUILD recode-3.6-r1.ebuild 1342 RMD160 88a5aee165a75b60c0d96da96aaf0aeac0a52d38
MD5 d6f82b48d8d0076d230a3aba6f57b0c9 recode-3.6-r1.ebuild 1342
RMD160 88a5aee165a75b60c0d96da96aaf0aeac0a52d38 recode-3.6-r1.ebuild 1342
SHA256 97a803581041dfc0c7c5f06d6179181233c928cccba59d72da3ace812a8b89b4 recode-3.6-r1.ebuild 1342
-EBUILD recode-3.6-r2.ebuild 1143 RMD160 b4c6e94ed21a52dd8652c25fcea465bdface0b1a SHA1 3d5674630325a4b8987c4631314d2997aa60ac5d SHA256 2a1d93f42d61495610a9038301bf56decbd20077a66cb23070740a90a61e2714
-MD5 d893d32b97f4be33147f9f29b54cb4e1 recode-3.6-r2.ebuild 1143
-RMD160 b4c6e94ed21a52dd8652c25fcea465bdface0b1a recode-3.6-r2.ebuild 1143
-SHA256 2a1d93f42d61495610a9038301bf56decbd20077a66cb23070740a90a61e2714 recode-3.6-r2.ebuild 1143
-MISC ChangeLog 3976 RMD160 77a1781866d486617e00f5879df73ed6923bc1e3 SHA1 56b95b155988652a3c540351da0fbe86fe736891 SHA256 6ef78791c155748fe63962f4a5535e380f5c9ce629f23aba42b93e54a909230f
-MD5 4951daefcc50754927effdda15d2daf1 ChangeLog 3976
-RMD160 77a1781866d486617e00f5879df73ed6923bc1e3 ChangeLog 3976
-SHA256 6ef78791c155748fe63962f4a5535e380f5c9ce629f23aba42b93e54a909230f ChangeLog 3976
+EBUILD recode-3.6-r2.ebuild 1206 RMD160 4828ec12be04a49958212a9a8d687390003d16be SHA1 1ea398e00ab54b33cd17f71787045c5f3376a284 SHA256 79d2f316cc5c4adec4f74b28c8e9711e249d3053edf5ee9573a97ca048d34b83
+MD5 a7dfa548a1e86358fdbbd69213f7995f recode-3.6-r2.ebuild 1206
+RMD160 4828ec12be04a49958212a9a8d687390003d16be recode-3.6-r2.ebuild 1206
+SHA256 79d2f316cc5c4adec4f74b28c8e9711e249d3053edf5ee9573a97ca048d34b83 recode-3.6-r2.ebuild 1206
+MISC ChangeLog 4228 RMD160 d0ad6f0a215283038b3c7b5475ad1b7746331367 SHA1 474ef35d7a1c569170578a9fd085766b07b0605b SHA256 37431fcfe33f845ec066bf158e23e980631425b40917ebf79666976364366208
+MD5 306a47358208793054d240175d91abde ChangeLog 4228
+RMD160 d0ad6f0a215283038b3c7b5475ad1b7746331367 ChangeLog 4228
+SHA256 37431fcfe33f845ec066bf158e23e980631425b40917ebf79666976364366208 ChangeLog 4228
MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 metadata.xml 165
@@ -36,7 +36,7 @@ SHA256 5c5b88848d2a20a6ba5cb17e140f7a064ed45096a74217c67364196c0853f13b files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
-iD8DBQFEuxXyamhnQswr0vIRAs/KAJ4rgWAd38HGM0KT193+uN0fN7jiFwCgtKSG
-lIP2g4MuFAguPUbnwrmK3ak=
-=IWXB
+iD8DBQFEvGdhAiZjviIA2XgRAkj2AJ0RqvmV45LVfambWzV3ZZxUDnPGiwCfeDHC
+l/dq69aIlXLrbtamvWnc4mU=
+=1C6F
-----END PGP SIGNATURE-----
diff --git a/app-text/recode/recode-3.6-r2.ebuild b/app-text/recode/recode-3.6-r2.ebuild
index 53b90ea3bdb7..ab865f9ffe78 100644
--- a/app-text/recode/recode-3.6-r2.ebuild
+++ b/app-text/recode/recode-3.6-r2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.7 2006/07/17 04:44:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.8 2006/07/18 04:45:14 flameeyes Exp $
-inherit flag-o-matic eutils libtool
+inherit flag-o-matic eutils libtool toolchain-funcs
DEB_VER=11
DESCRIPTION="Convert files between various character sets"
@@ -21,15 +21,18 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-debian-${DEB_VER}.patch
+ # Needed under FreeBSD, too
+ epatch "${FILESDIR}"/${P}-ppc-macos.diff
+ cp lib/error.c lib/xstrdup.c src/ || die "file copy failed"
+
if use ppc-macos; then
- epatch "${FILESDIR}"/${P}-ppc-macos.diff
- cp lib/error.c lib/xstrdup.c src/ || die "file copy failed"
- elibtoolize
append-ldflags -lgettextlib
fi
+ elibtoolize
}
src_compile() {
+ tc-export CC LD
econf $(use_enable nls) || die "econf failed"
emake || die "emake failed"
}