link against -lintl on non glibc systems when app-text/recode is built with nls, #184399.

Package-Manager: portage-2.1.3_rc6

3 files changed, 22 insertions, 15 deletions

diff --git a/games-misc/fortune-mod/ChangeLog b/games-misc/fortune-mod/ChangeLog
index 91b34a8b3a1c..b8329cbc809a 100644
--- a/games-misc/fortune-mod/ChangeLog
+++ b/games-misc/fortune-mod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-misc/fortune-mod
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.22 2006/07/20 08:08:46 mr_bones_ Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.23 2007/07/06 09:24:38 uberlord Exp $
+
+  06 Jul 2007; Roy Marples <uberlord@gentoo.org>
+  fortune-mod-1.99.1-r2.ebuild:
+  link against -lintl on non glibc systems when app-text/recode is built with
+  nls, #184399.
 
   20 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
   fortune-mod-1.99.1-r2.ebuild:
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index e6d0250e4c2d..d3da5dc759b9 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -7,14 +7,14 @@ MD5 dfeb667d0b8e224327bc2adfe359f9af files/fortune-mod-1.99.1-gentoo.patch 2699
 RMD160 01c0e6a534933841dd5529cb36bcc24874861275 files/fortune-mod-1.99.1-gentoo.patch 2699
 SHA256 840c56ee0128d118a861dd33c3aa04e635d20af5febc626864cdc22943223490 files/fortune-mod-1.99.1-gentoo.patch 2699
 DIST fortune-mod-1.99.1.tar.gz 1812089 RMD160 020e597bde43ebd58ea82171d0e69222dc26b566 SHA1 53aa354025094d7c0e544bb1662714815fa63918 SHA256 fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
-EBUILD fortune-mod-1.99.1-r2.ebuild 1313 RMD160 475bc46086a713be1109c6bc7d5145e29dbe84b8 SHA1 f70dd44f0afa0e498c4ee8223bed590c9b4fe6c1 SHA256 c767afdd50a105eb244f946004f2e84cd085d7e075cd09328b796d54f9bc4010
-MD5 194d5a8687f8bbc09d961c52091390e6 fortune-mod-1.99.1-r2.ebuild 1313
-RMD160 475bc46086a713be1109c6bc7d5145e29dbe84b8 fortune-mod-1.99.1-r2.ebuild 1313
-SHA256 c767afdd50a105eb244f946004f2e84cd085d7e075cd09328b796d54f9bc4010 fortune-mod-1.99.1-r2.ebuild 1313
-MISC ChangeLog 5195 RMD160 5e71c8e7d3084b99c67e2410092d730866204f0e SHA1 c0fcc87ae084b70e1fa743b2d449f00ffbc301ce SHA256 125de530bd42e072c491e684ca25385632574e712cb90de28dc60056759cb214
-MD5 de8b3d424c815f5256a9038b39b9e700 ChangeLog 5195
-RMD160 5e71c8e7d3084b99c67e2410092d730866204f0e ChangeLog 5195
-SHA256 125de530bd42e072c491e684ca25385632574e712cb90de28dc60056759cb214 ChangeLog 5195
+EBUILD fortune-mod-1.99.1-r2.ebuild 1421 RMD160 b3cdfe62ae656e77312d8bfbaaccacc21fa6997c SHA1 aed1c23660bd157ba01f22b9aa8919b144635d80 SHA256 72a5eb5030cd38f2df8af756538fe56afb5e7d4b022003d70348bb07909024b8
+MD5 567bd405e4693c00ccd64993d2729a52 fortune-mod-1.99.1-r2.ebuild 1421
+RMD160 b3cdfe62ae656e77312d8bfbaaccacc21fa6997c fortune-mod-1.99.1-r2.ebuild 1421
+SHA256 72a5eb5030cd38f2df8af756538fe56afb5e7d4b022003d70348bb07909024b8 fortune-mod-1.99.1-r2.ebuild 1421
+MISC ChangeLog 5370 RMD160 8449988f762a6ab4d93a2d6bb9da6303a60c363b SHA1 af2832171326f3d953c04611912eb1c2e66a2597 SHA256 bf04f8f97a300f882316b085f6cd0e5cd17fd97076ae4bceb6b6e6df71d68fac
+MD5 ab98fad84e007bf3e1fb07bc8690c2fa ChangeLog 5370
+RMD160 8449988f762a6ab4d93a2d6bb9da6303a60c363b ChangeLog 5370
+SHA256 bf04f8f97a300f882316b085f6cd0e5cd17fd97076ae4bceb6b6e6df71d68fac ChangeLog 5370
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
index 77104b436279..3313d46b967b 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.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/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild,v 1.5 2006/07/20 08:08:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild,v 1.6 2007/07/06 09:24:38 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="offensive"
+IUSE="offensive elibc_glibc"
 
 DEPEND="app-text/recode"
 
@@ -30,9 +30,11 @@ src_unpack() {
 		-e "/^OFFENSIVE=/s:=.*:=`use offensive && echo 1 || echo 0`:" \
 		Makefile || die "sed Makefile failed"
 
-	if use elibc_FreeBSD ; then
+	if ! use elibc_glibc ; then
+		local reglibs="-lcompat"
+		built_with_use app-text/recode nls && reglibs="${reglibs} -lintl"
 		sed -i \
-			-e '/^REGEXLIBS=/s:=.*:= -lcompat:' \
+			-e "/^REGEXLIBS=/s:=.*:= ${reglibs}:" \
 			Makefile \
 			|| die "sed REGEXLIBS failed"
 	fi