From 8af6166f8cd79e23edbae27cc21ccaf5ef842203 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 23 Jan 2007 19:46:08 +0000 Subject: [PATCH] Dropped ppc-macos keyword, see you in prefix Package-Manager: portage-2.1.1-r2 --- sys-devel/gettext/ChangeLog | 8 ++- sys-devel/gettext/Manifest | 80 +++++++++++----------- sys-devel/gettext/gettext-0.12.1-r2.ebuild | 16 ++--- sys-devel/gettext/gettext-0.14.1-r1.ebuild | 31 +++------ sys-devel/gettext/gettext-0.14.2.ebuild | 37 +++------- sys-devel/gettext/gettext-0.14.4.ebuild | 25 ++----- sys-devel/gettext/gettext-0.14.5.ebuild | 24 ++----- sys-devel/gettext/gettext-0.14.6.ebuild | 36 ++++------ sys-devel/gettext/gettext-0.15-r1.ebuild | 6 +- sys-devel/gettext/gettext-0.15.ebuild | 6 +- sys-devel/gettext/gettext-0.16.1.ebuild | 4 +- 11 files changed, 102 insertions(+), 171 deletions(-) diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog index 1c3d51517caa..21a26edb3f1a 100644 --- a/sys-devel/gettext/ChangeLog +++ b/sys-devel/gettext/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/gettext # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.137 2007/01/23 12:45:13 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.138 2007/01/23 19:46:08 grobian Exp $ + + 23 Jan 2007; Fabian Groffen gettext-0.12.1-r2.ebuild, + gettext-0.14.1-r1.ebuild, gettext-0.14.2.ebuild, gettext-0.14.4.ebuild, + gettext-0.14.5.ebuild, gettext-0.14.6.ebuild, gettext-0.15.ebuild, + gettext-0.15-r1.ebuild, gettext-0.16.1.ebuild: + Dropped ppc-macos keyword, see you in prefix 23 Jan 2007; Jeroen Roovers gettext-0.16.1.ebuild: Stable for HPPA (bug #163178). diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index aa9888897655..3d6b15fb3a27 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -46,46 +46,46 @@ DIST gettext-0.14.5.tar.gz 7105715 RMD160 d31c8e49671f00623ce1e6f73716a5abcd1c7e DIST gettext-0.14.6.tar.gz 7102365 RMD160 02138d12fd4d9ce0b3bda2d132f1569b30d16726 SHA1 0d8ce8d9a09a719065a1530399c4f45c15a002c5 SHA256 4cf3165d3477a23174170e89bfa3af963ac43eb3b51b32e343dab807c841a0b0 DIST gettext-0.15.tar.gz 8081941 RMD160 e485b60965cf74808801e674c570c7ccd63bd61e SHA1 84f9cb6a043d4a85acf06f8c89f2a34202efa210 SHA256 178100e9375df74e6569e8ac89790b713476204e27283287e2637d07a5760e08 DIST gettext-0.16.1.tar.gz 8539634 RMD160 0fa96b2d005e2490e8603a0a3612041086d5aea1 SHA1 8642f4346dfd6a18ecd883329e150bfe9e0886c3 SHA256 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d -EBUILD gettext-0.12.1-r2.ebuild 2517 RMD160 f9adb452cfad03096650e14e8d8a1f9b5e02d636 SHA1 e9da0a98178a93f539f7d17e897752adcdf6f1d6 SHA256 f425450647b42eae8f3b850741f9b0ca5ee442f411f909aa568e91d23ec15714 -MD5 d132fd6d8d5555255e6a13be6f2ea02d gettext-0.12.1-r2.ebuild 2517 -RMD160 f9adb452cfad03096650e14e8d8a1f9b5e02d636 gettext-0.12.1-r2.ebuild 2517 -SHA256 f425450647b42eae8f3b850741f9b0ca5ee442f411f909aa568e91d23ec15714 gettext-0.12.1-r2.ebuild 2517 -EBUILD gettext-0.14.1-r1.ebuild 2862 RMD160 2f7c801e9f1c2c5b31e6fc7b7cf1b655cf8fa65d SHA1 027cf83754b2b6fb9c397b2cbaa1319258b0e2da SHA256 c0e0da529f23b707ca200823c54e3403af0059fb7e1a48001236ee15e4848d0b -MD5 818c6a0287fb3e3d77fe82544d275de1 gettext-0.14.1-r1.ebuild 2862 -RMD160 2f7c801e9f1c2c5b31e6fc7b7cf1b655cf8fa65d gettext-0.14.1-r1.ebuild 2862 -SHA256 c0e0da529f23b707ca200823c54e3403af0059fb7e1a48001236ee15e4848d0b gettext-0.14.1-r1.ebuild 2862 -EBUILD gettext-0.14.2.ebuild 3510 RMD160 16ab6051763ba940b4fec36612cada347d8393cf SHA1 75bbb64429e587172bb100d6defcc69f34968c57 SHA256 5a0b7dc74187456c28e9d024bf43f99f9e80d33e881a03d9e9401326793935fd -MD5 a04e7004da6255a93df350bd1d64be9e gettext-0.14.2.ebuild 3510 -RMD160 16ab6051763ba940b4fec36612cada347d8393cf gettext-0.14.2.ebuild 3510 -SHA256 5a0b7dc74187456c28e9d024bf43f99f9e80d33e881a03d9e9401326793935fd gettext-0.14.2.ebuild 3510 -EBUILD gettext-0.14.4.ebuild 3579 RMD160 b3e6f14a75e024bc355d6874af4cf5101e42bd1d SHA1 4b8c9f0514e28f3e50c2f78d246f91617df70563 SHA256 b0fa16e36fdf483a785ceb9c89b206968b7a2316a3ffbfa34c3a9baa584b5517 -MD5 c6bb4f8ebfde1166af5b0a87ef9ffc3d gettext-0.14.4.ebuild 3579 -RMD160 b3e6f14a75e024bc355d6874af4cf5101e42bd1d gettext-0.14.4.ebuild 3579 -SHA256 b0fa16e36fdf483a785ceb9c89b206968b7a2316a3ffbfa34c3a9baa584b5517 gettext-0.14.4.ebuild 3579 -EBUILD gettext-0.14.5.ebuild 3798 RMD160 2a4a75dd8f3b13d52fbba71e9cc8af67ef204227 SHA1 f35cc3d1f151891d501370d1e28475e5ce619c28 SHA256 368fe0f093479ab711a74cdc493139ce75d259f4423a6ed7763b3c81354fdfdc -MD5 d57980eb05a3c0d789d34aa90ca311fa gettext-0.14.5.ebuild 3798 -RMD160 2a4a75dd8f3b13d52fbba71e9cc8af67ef204227 gettext-0.14.5.ebuild 3798 -SHA256 368fe0f093479ab711a74cdc493139ce75d259f4423a6ed7763b3c81354fdfdc gettext-0.14.5.ebuild 3798 -EBUILD gettext-0.14.6.ebuild 4027 RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58deb SHA1 42991941ebe3d30bde6620f9a30ffb0db90cc325 SHA256 53df3dbe7d1777f44f451ab3452e9d53b15e103f8bf9d9292b6826c61404406f -MD5 ceaf0fc1da75a74c7779f1981158dc48 gettext-0.14.6.ebuild 4027 -RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58deb gettext-0.14.6.ebuild 4027 -SHA256 53df3dbe7d1777f44f451ab3452e9d53b15e103f8bf9d9292b6826c61404406f gettext-0.14.6.ebuild 4027 -EBUILD gettext-0.15-r1.ebuild 3721 RMD160 a75f8c5a087ae7d0b3ec95bed9a3b488ab304e38 SHA1 fc7711f3f3a18b62ca427fd82d8df98c4634df6d SHA256 0501bcefd1b7dcda0341bb82fdefb22e4f01d8601f9b04ca976677b3bb9a5363 -MD5 6bdec77f3562fc114038bce7e39b5fc8 gettext-0.15-r1.ebuild 3721 -RMD160 a75f8c5a087ae7d0b3ec95bed9a3b488ab304e38 gettext-0.15-r1.ebuild 3721 -SHA256 0501bcefd1b7dcda0341bb82fdefb22e4f01d8601f9b04ca976677b3bb9a5363 gettext-0.15-r1.ebuild 3721 -EBUILD gettext-0.15.ebuild 3821 RMD160 dde83f5732b90b103a5ec30d38bc781fcdc23376 SHA1 65722fc1388ca5c694708ad6fe539da092a1df7e SHA256 9accf58a5f92754f3c4fc128747af5d7cab922683b0096c8ed1e966b7b0daab4 -MD5 bc29b9e95d2bf48ca017457c8b502127 gettext-0.15.ebuild 3821 -RMD160 dde83f5732b90b103a5ec30d38bc781fcdc23376 gettext-0.15.ebuild 3821 -SHA256 9accf58a5f92754f3c4fc128747af5d7cab922683b0096c8ed1e966b7b0daab4 gettext-0.15.ebuild 3821 -EBUILD gettext-0.16.1.ebuild 3708 RMD160 74a667f7a578302ae0c7bfff57a9e13e361b79f1 SHA1 29824e235fc4a6b13e6c1194eae892fca536cb15 SHA256 2ab8f7481aa422337e2cf704ebf4d2b35eb71064efdf4de98bb5ed9d19e0e233 -MD5 1ba4e9b507396feb423c743e022995a1 gettext-0.16.1.ebuild 3708 -RMD160 74a667f7a578302ae0c7bfff57a9e13e361b79f1 gettext-0.16.1.ebuild 3708 -SHA256 2ab8f7481aa422337e2cf704ebf4d2b35eb71064efdf4de98bb5ed9d19e0e233 gettext-0.16.1.ebuild 3708 -MISC ChangeLog 17322 RMD160 ab3986e2a3f4a779e7d19619ade546f034fbf67d SHA1 ff1fb91dc1f154c05404d35691e4ee6ebc985122 SHA256 6d3878a2635a0ee1b15e9fb223ad91d120e032e83baf4edc266cc09141909d27 -MD5 caa42ae35f034a6f4c176ecdfe2d2120 ChangeLog 17322 -RMD160 ab3986e2a3f4a779e7d19619ade546f034fbf67d ChangeLog 17322 -SHA256 6d3878a2635a0ee1b15e9fb223ad91d120e032e83baf4edc266cc09141909d27 ChangeLog 17322 +EBUILD gettext-0.12.1-r2.ebuild 2240 RMD160 08575d870bda6568ddf9270691ec4089ae00b402 SHA1 4c85e0f61aea2bb255cacc9849fae7486c2497fb SHA256 eb2829d7fccc9fa5531fdef0f40168991d36031015d2a8ce1b9f60d86854d2b7 +MD5 03aebf522e5dfac1625d4be1b9f672e4 gettext-0.12.1-r2.ebuild 2240 +RMD160 08575d870bda6568ddf9270691ec4089ae00b402 gettext-0.12.1-r2.ebuild 2240 +SHA256 eb2829d7fccc9fa5531fdef0f40168991d36031015d2a8ce1b9f60d86854d2b7 gettext-0.12.1-r2.ebuild 2240 +EBUILD gettext-0.14.1-r1.ebuild 2459 RMD160 ef8672e101f0ad5ba58d4fd27cafaf231cb004d4 SHA1 1e8f0cd817570243b27b0ff25cdd44fa767fd0cd SHA256 c07c175f12ac1f85072fc7d44104540692aa481b2d06a14be525fec01893a9b2 +MD5 a2829d6910293b45578d2486d2281b73 gettext-0.14.1-r1.ebuild 2459 +RMD160 ef8672e101f0ad5ba58d4fd27cafaf231cb004d4 gettext-0.14.1-r1.ebuild 2459 +SHA256 c07c175f12ac1f85072fc7d44104540692aa481b2d06a14be525fec01893a9b2 gettext-0.14.1-r1.ebuild 2459 +EBUILD gettext-0.14.2.ebuild 3081 RMD160 b00bbb63a9eb138888d6d3556e3b72fcdc7b9e94 SHA1 eacae0f90d00e2f8be9d90052bde933c38f84d0e SHA256 9023a101179fe85cf273caee88d4c5550995757f3057eef8694ee78f12ab5498 +MD5 f4ee57f9ecbe6ce3b641353c4254123b gettext-0.14.2.ebuild 3081 +RMD160 b00bbb63a9eb138888d6d3556e3b72fcdc7b9e94 gettext-0.14.2.ebuild 3081 +SHA256 9023a101179fe85cf273caee88d4c5550995757f3057eef8694ee78f12ab5498 gettext-0.14.2.ebuild 3081 +EBUILD gettext-0.14.4.ebuild 3229 RMD160 60106dec5c2a6071b1e031b186eae65b8b65fbfe SHA1 b506011a580d0054ba7e92f97e980775eba387cf SHA256 ebefd536fb1e27461a2dd1d5fb2b9266152473c7efaf58b2874d8dbd1ccaf1ce +MD5 556ea6e5cb10178680988ab059b66994 gettext-0.14.4.ebuild 3229 +RMD160 60106dec5c2a6071b1e031b186eae65b8b65fbfe gettext-0.14.4.ebuild 3229 +SHA256 ebefd536fb1e27461a2dd1d5fb2b9266152473c7efaf58b2874d8dbd1ccaf1ce gettext-0.14.4.ebuild 3229 +EBUILD gettext-0.14.5.ebuild 3484 RMD160 37c215fda6ff5824cffdece13ba59ab9aeef423f SHA1 8b92fa062393eaaf00b5c9086ad2454a7a7c5c47 SHA256 0b4d330c34f76ea24ae93e228415a7020e2981e6af60763921762792ce55e9aa +MD5 4b36f8fea9a3b24e78d02ee6fb9bdea6 gettext-0.14.5.ebuild 3484 +RMD160 37c215fda6ff5824cffdece13ba59ab9aeef423f gettext-0.14.5.ebuild 3484 +SHA256 0b4d330c34f76ea24ae93e228415a7020e2981e6af60763921762792ce55e9aa gettext-0.14.5.ebuild 3484 +EBUILD gettext-0.14.6.ebuild 3702 RMD160 2dc0f5cd16b5fc9c2c135add92be471381243e45 SHA1 4db168c41e8e6b5f92dda583d665e9de36d7b82f SHA256 76c59cede31846eeee2b05894f22b6239d464d1701c82ddc2a39c384afd1d1e0 +MD5 175fad225eba1f83d99e506d68ab2740 gettext-0.14.6.ebuild 3702 +RMD160 2dc0f5cd16b5fc9c2c135add92be471381243e45 gettext-0.14.6.ebuild 3702 +SHA256 76c59cede31846eeee2b05894f22b6239d464d1701c82ddc2a39c384afd1d1e0 gettext-0.14.6.ebuild 3702 +EBUILD gettext-0.15-r1.ebuild 3711 RMD160 0c1a56b90f987a294cc4baa4acfe9b3032d5393e SHA1 9295a6f3ae28d506168a0c2bc309be9b6bb7649d SHA256 dd5f977e10c8ccc12f141d33b7f0305aad5e4750daf92ab17ba147d733e4a80e +MD5 22dc67db87d4d378795364ca44a0426d gettext-0.15-r1.ebuild 3711 +RMD160 0c1a56b90f987a294cc4baa4acfe9b3032d5393e gettext-0.15-r1.ebuild 3711 +SHA256 dd5f977e10c8ccc12f141d33b7f0305aad5e4750daf92ab17ba147d733e4a80e gettext-0.15-r1.ebuild 3711 +EBUILD gettext-0.15.ebuild 3812 RMD160 ce88946a297b943f0568c7fea64c369c4e235c72 SHA1 c6e673cfb459bb56c9b805238fab9e9aaf7c5517 SHA256 f894c1e5675558ca197400ed6e5f3bfc5881d19f457004163c614a349c8c6cf5 +MD5 740d3b73f7ec665d41501da1f17f1a24 gettext-0.15.ebuild 3812 +RMD160 ce88946a297b943f0568c7fea64c369c4e235c72 gettext-0.15.ebuild 3812 +SHA256 f894c1e5675558ca197400ed6e5f3bfc5881d19f457004163c614a349c8c6cf5 gettext-0.15.ebuild 3812 +EBUILD gettext-0.16.1.ebuild 3701 RMD160 0e1837a0bb975ca141ddbd78d5feb4308b18a1e0 SHA1 b9b85b9afd87efd0333ccc97b5a3f7f4f8a26b98 SHA256 944cf099a891dbfc1d3f8908a7789bbabc01eb3d25fed6dd8a16529fdccb3fa9 +MD5 418ae9165a9207f0e7929d155fcf8296 gettext-0.16.1.ebuild 3701 +RMD160 0e1837a0bb975ca141ddbd78d5feb4308b18a1e0 gettext-0.16.1.ebuild 3701 +SHA256 944cf099a891dbfc1d3f8908a7789bbabc01eb3d25fed6dd8a16529fdccb3fa9 gettext-0.16.1.ebuild 3701 +MISC ChangeLog 17643 RMD160 53f15950061e0cfb459f7c8e1a807af0458f4fe1 SHA1 f6d5bd109fe12debcc240f570ed5e72d45bdda5c SHA256 8715353b8a04a0539d94da53cd860f90faf11b9819c25cab2d186958809319b4 +MD5 0221bc1b9f7e04e9e9cfd9c945be5025 ChangeLog 17643 +RMD160 53f15950061e0cfb459f7c8e1a807af0458f4fe1 ChangeLog 17643 +SHA256 8715353b8a04a0539d94da53cd860f90faf11b9819c25cab2d186958809319b4 ChangeLog 17643 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 diff --git a/sys-devel/gettext/gettext-0.12.1-r2.ebuild b/sys-devel/gettext/gettext-0.12.1-r2.ebuild index e6f7d0500f3c..c1baa777ca15 100644 --- a/sys-devel/gettext/gettext-0.12.1-r2.ebuild +++ b/sys-devel/gettext/gettext-0.12.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.20 2007/01/05 09:15:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.21 2007/01/23 19:46:08 grobian Exp $ inherit eutils toolchain-funcs libtool @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="emacs nls" DEPEND="virtual/libc" @@ -20,12 +20,11 @@ src_unpack() { cd ${S} epunt_cxx epatch ${FILESDIR}/${P}-tempfile.patch #66355 - use ppc-macos || elibtoolize --reverse-deps } src_compile() { local myconf="" - use ppc-macos && myconf="--enable-nls" || myconf="`use_enable nls`" + myconf="`use_enable nls`" # Compaq Java segfaults trying to build gettext stuff, and there's # no good way to tell gettext to refrain from building the java @@ -65,14 +64,9 @@ src_install() { doexe gettext-tools/misc/gettextize || die "doexe" # remove stuff that glibc handles - if ! use ppc-macos; then - # these files are not provided on Mac OS X - rm -f ${D}/usr/include/libintl.h - rm -f ${D}/usr/$(get_libdir)/libintl.* - fi + rm -f ${D}/usr/include/libintl.h + rm -f ${D}/usr/$(get_libdir)/libintl.* rm -rf ${D}/usr/share/locale/locale.alias - # /usr/lib/charset.alias is provided by Mac OS X - use ppc-macos && rm -f ${D}/usr/lib/charset.alias if [ -d ${D}/usr/doc/gettext ] then diff --git a/sys-devel/gettext/gettext-0.14.1-r1.ebuild b/sys-devel/gettext/gettext-0.14.1-r1.ebuild index e1be30709a0d..0cb2fc9b141d 100644 --- a/sys-devel/gettext/gettext-0.14.1-r1.ebuild +++ b/sys-devel/gettext/gettext-0.14.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1-r1.ebuild,v 1.5 2007/01/05 09:15:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1-r1.ebuild,v 1.6 2007/01/23 19:46:08 grobian Exp $ inherit eutils toolchain-funcs mono libtool @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc-macos ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="emacs nls" DEPEND="" @@ -27,11 +27,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-without_java.patch epatch "${FILESDIR}"/${P}-no-java-tests.patch - if use ppc-macos ; then - elibtoolize - else - elibtoolize --reverse-deps - fi + elibtoolize --reverse-deps } src_compile() { @@ -60,27 +56,16 @@ src_install() { doexe gettext-tools/misc/gettextize || die "doexe" # remove stuff that glibc handles - if ! use ppc-macos; then - # Mac OS X does not provide these files. - rm -f ${D}/usr/include/libintl.h - rm -f ${D}/usr/$(get_libdir)/libintl.* - fi + rm -f ${D}/usr/include/libintl.h + rm -f ${D}/usr/$(get_libdir)/libintl.* rm -rf ${D}/usr/share/locale/locale.alias # older gettext's sometimes installed libintl ... # need to keep the linked version or the system # could die (things like sed link against it :/) - if use ppc-macos; then - rm -f ${D}/usr/lib/charset.alias - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/ - touch ${D}/usr/$(get_libdir)/libintl.2.dylib - fi - else - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ - touch ${D}/usr/$(get_libdir)/libintl.so.2* - fi + if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then + cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ + touch ${D}/usr/$(get_libdir)/libintl.so.2* fi if [ -d ${D}/usr/doc/gettext ] diff --git a/sys-devel/gettext/gettext-0.14.2.ebuild b/sys-devel/gettext/gettext-0.14.2.ebuild index f52a0019bdbe..5427fa4cc672 100644 --- a/sys-devel/gettext/gettext-0.14.2.ebuild +++ b/sys-devel/gettext/gettext-0.14.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.2.ebuild,v 1.8 2006/03/09 23:49:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.2.ebuild,v 1.9 2007/01/23 19:46:08 grobian Exp $ inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="emacs nls" DEPEND="" @@ -42,12 +42,7 @@ src_unpack() { gettext-tools/examples/installpaths.in \ || die "sed docdir" - if use ppc-macos ; then - glibtoolize - append-flags -bind_at_load - else - elibtoolize --reverse-deps - fi + elibtoolize --reverse-deps } src_compile() { @@ -73,31 +68,19 @@ src_install() { doexe gettext-tools/misc/gettextize || die "doexe" # remove stuff that glibc handles - if ! use ppc-macos; then - # Mac OS X does not provide these files. - rm -f ${D}/usr/include/libintl.h - rm -f ${D}/usr/$(get_libdir)/libintl.* - fi + rm -f ${D}/usr/include/libintl.h + rm -f ${D}/usr/$(get_libdir)/libintl.* rm -rf ${D}/usr/share/locale/locale.alias # older gettext's sometimes installed libintl ... # need to keep the linked version or the system # could die (things like sed link against it :/) - if use ppc-macos; then - rm -f ${D}/usr/lib/charset.alias - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/ - touch ${D}/usr/$(get_libdir)/libintl.2.dylib - fi - else - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ - touch ${D}/usr/$(get_libdir)/libintl.so.2* - fi + if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then + cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ + touch ${D}/usr/$(get_libdir)/libintl.so.2* fi - if [ -d ${D}/usr/doc/gettext ] - then + if [ -d ${D}/usr/doc/gettext ] ; then mv ${D}/usr/doc/gettext ${D}/usr/share/doc/${PF}/html rm -rf ${D}/usr/doc fi diff --git a/sys-devel/gettext/gettext-0.14.4.ebuild b/sys-devel/gettext/gettext-0.14.4.ebuild index a45290cbe022..87a355f718ad 100644 --- a/sys-devel/gettext/gettext-0.14.4.ebuild +++ b/sys-devel/gettext/gettext-0.14.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.4.ebuild,v 1.15 2006/03/09 23:49:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.4.ebuild,v 1.16 2007/01/23 19:46:08 grobian Exp $ inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" IUSE="emacs nls doc" DEPEND="|| ( sys-libs/glibc dev-libs/libiconv )" @@ -41,11 +41,6 @@ src_unpack() { gettext-tools/configure \ gettext-tools/examples/installpaths.in \ || die "sed docdir" - - if use ppc-macos ; then - glibtoolize - append-flags -bind_at_load - fi } src_compile() { @@ -81,17 +76,9 @@ src_install() { # older gettext's sometimes installed libintl ... # need to keep the linked version or the system # could die (things like sed link against it :/) - if use ppc-macos; then - rm -f "${D}"/usr/lib/charset.alias - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/ - touch ${D}/usr/$(get_libdir)/libintl.2.dylib - fi - else - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ - touch ${D}/usr/$(get_libdir)/libintl.so.2* - fi + if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then + cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ + touch ${D}/usr/$(get_libdir)/libintl.so.2* fi if ! use doc ; then diff --git a/sys-devel/gettext/gettext-0.14.5.ebuild b/sys-devel/gettext/gettext-0.14.5.ebuild index 89d0940de9dc..537593732514 100644 --- a/sys-devel/gettext/gettext-0.14.5.ebuild +++ b/sys-devel/gettext/gettext-0.14.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.5.ebuild,v 1.18 2006/09/04 05:59:29 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.5.ebuild,v 1.19 2007/01/23 19:46:08 grobian Exp $ inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="emacs nls doc nocxx" DEPEND="virtual/libiconv" @@ -42,11 +42,6 @@ src_unpack() { gettext-tools/examples/installpaths.in \ || die "sed docdir" - if use ppc-macos ; then - glibtoolize - append-flags -bind_at_load - fi - # sanity check for Bug 105304 if [[ -z ${USERLAND} ]] ; then eerror "You just hit Bug 105304, please post your 'emerge info' here:" @@ -88,16 +83,9 @@ src_install() { # older gettext's sometimes installed libintl ... # need to keep the linked version or the system # could die (things like sed link against it :/) - if use ppc-macos; then - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/ - touch "${D}"/usr/$(get_libdir)/libintl.2.dylib - fi - else - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ - touch "${D}"/usr/$(get_libdir)/libintl.so.2* - fi + if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then + cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ + touch "${D}"/usr/$(get_libdir)/libintl.so.2* fi if ! use doc ; then diff --git a/sys-devel/gettext/gettext-0.14.6.ebuild b/sys-devel/gettext/gettext-0.14.6.ebuild index 588e976b5f46..c8f5966aa148 100644 --- a/sys-devel/gettext/gettext-0.14.6.ebuild +++ b/sys-devel/gettext/gettext-0.14.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.6.ebuild,v 1.3 2006/07/21 18:38:09 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.6.ebuild,v 1.4 2007/01/23 19:46:08 grobian Exp $ inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="emacs nls doc nocxx" DEPEND="virtual/libiconv" @@ -42,11 +42,6 @@ src_unpack() { gettext-tools/examples/installpaths.in \ || die "sed docdir" - if use ppc-macos ; then - glibtoolize - append-flags -bind_at_load - fi - # sanity check for Bug 105304 if [[ -z ${USERLAND} ]] ; then eerror "You just hit Bug 105304, please post your 'emerge info' here:" @@ -88,22 +83,15 @@ src_install() { # older gettext's sometimes installed libintl ... # need to keep the linked version or the system # could die (things like sed link against it :/) - if use ppc-macos; then - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/ - touch "${D}"/usr/$(get_libdir)/libintl.2.dylib - fi - else - if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ - touch "${D}"/usr/$(get_libdir)/libintl.so.2* - fi - if ! use elibc_glibc; then - # Move dynamic libs and creates ldscripts into /usr/lib - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/libintl.so* "${D}/$(get_libdir)" - gen_usr_ldscript libintl.so - fi + if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then + cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ + touch "${D}"/usr/$(get_libdir)/libintl.so.2* + fi + if ! use elibc_glibc; then + # Move dynamic libs and creates ldscripts into /usr/lib + dodir /$(get_libdir) + mv "${D}"/usr/$(get_libdir)/libintl.so* "${D}/$(get_libdir)" + gen_usr_ldscript libintl.so fi if ! use doc ; then diff --git a/sys-devel/gettext/gettext-0.15-r1.ebuild b/sys-devel/gettext/gettext-0.15-r1.ebuild index eb2f7d6f65d7..009f946d5fb9 100644 --- a/sys-devel/gettext/gettext-0.15-r1.ebuild +++ b/sys-devel/gettext/gettext-0.15-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15-r1.ebuild,v 1.4 2006/12/30 00:58:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15-r1.ebuild,v 1.5 2007/01/23 19:46:08 grobian Exp $ inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="emacs nls doc nocxx" DEPEND="virtual/libiconv diff --git a/sys-devel/gettext/gettext-0.15.ebuild b/sys-devel/gettext/gettext-0.15.ebuild index cb89105212ae..026f6fb6b213 100644 --- a/sys-devel/gettext/gettext-0.15.ebuild +++ b/sys-devel/gettext/gettext-0.15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15.ebuild,v 1.19 2006/12/30 00:58:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15.ebuild,v 1.20 2007/01/23 19:46:08 grobian Exp $ inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="emacs nls doc nocxx" DEPEND="virtual/libiconv" diff --git a/sys-devel/gettext/gettext-0.16.1.ebuild b/sys-devel/gettext/gettext-0.16.1.ebuild index 6e9a90e0eba3..817437f3b1c8 100644 --- a/sys-devel/gettext/gettext-0.16.1.ebuild +++ b/sys-devel/gettext/gettext-0.16.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.6 2007/01/23 12:45:13 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.7 2007/01/23 19:46:08 grobian Exp $ inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc-macos ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="emacs nls doc nocxx" DEPEND="virtual/libiconv -- 2.26.2