Testing ppc-macos. Submitted on behalf of Fabian Groffen

Package-Manager: portage-2.0.51.19

4 files changed, 60 insertions, 18 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 66933b9c39c3..4304d991a778 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.16 2005/07/08 01:48:11 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.17 2005/07/09 02:30:33 j4rg0n Exp $
+
+  09 Jul 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/elinks-osx-configure.diff, elinks-0.10.5.ebuild:
+  Testing ppc-macos. Submitted on behalf of Fabian Groffen.
 
   08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> elinks-0.10.5.ebuild:
   Stable on sparc
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index f19f42b31549..78d6d2bdd2ba 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ce907c96ecafd726a064b6f2b4a466de elinks-0.10.4.ebuild 3192
-MD5 4a28575fbe8aaafe3ab30b2f6a6dbc6f elinks-0.10.5.ebuild 3203
-MD5 7c598c14d0454b2947366a2a8e958ed4 ChangeLog 9588
+MD5 abd031447e6a09a0ab8f2ca7c9f47586 ChangeLog 9754
 MD5 6ea6b66b701a92460771bc83faf03885 elinks-0.10.2.ebuild 3186
 MD5 cc608dd1c0f7b525296b4830621c796f elinks-0.10.3.ebuild 3186
+MD5 ce907c96ecafd726a064b6f2b4a466de elinks-0.10.4.ebuild 3192
+MD5 69ebb4f29d1a7eb868b61cf2b75f768d elinks-0.10.5.ebuild 3532
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+MD5 65d9de39657dcfae706f0094ace2eb29 files/digest-elinks-0.10.2 131
+MD5 e6446a6518b45e9c5726c66694459bea files/digest-elinks-0.10.3 131
 MD5 3a034044f65e503bf253636b844d5845 files/digest-elinks-0.10.4 132
 MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5 132
-MD5 e6446a6518b45e9c5726c66694459bea files/digest-elinks-0.10.3 131
-MD5 65d9de39657dcfae706f0094ace2eb29 files/digest-elinks-0.10.2 131
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzdtwKRy60XGEcJIRAkL5AKChKZt8iE9mb1fip9dgWw+fO1asMgCeOnY2
-l8rHiegE6vMrPfHTO0NTYeA=
-=r1Pf
------END PGP SIGNATURE-----
+MD5 8641dcff9f251387e7eba19875a7077c files/elinks-osx-configure.diff 919
diff --git a/www-client/elinks/elinks-0.10.5.ebuild b/www-client/elinks/elinks-0.10.5.ebuild
index 31bf2791fcc9..98358bc4ca8a 100644
--- a/www-client/elinks/elinks-0.10.5.ebuild
+++ b/www-client/elinks/elinks-0.10.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5.ebuild,v 1.4 2005/07/08 01:48:11 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5.ebuild,v 1.5 2005/07/09 02:30:33 j4rg0n Exp $
+
+inherit eutils
 
 IUSE="gpm zlib ssl ipv6 X lua guile"
 
@@ -13,7 +15,7 @@ SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~amd64 ~alpha ~ppc64 ~mips"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc-macos ~ppc64 sparc x86"
 
 DEPEND="virtual/libc
 	>=app-arch/bzip2-1.0.2
@@ -37,6 +39,7 @@ src_unpack() {
 		-e 's:CONFIG_LEDS=.*:CONFIG_LEDS=yes:' \
 		-e 's:CONFIG_HTML_HIGHLIGHT=.*:CONFIG_HTML_HIGHLIGHT=yes:' \
 		${S}/features.conf
+	use ppc-macos && epatch ${FILESDIR}/${PN}-osx-configure.diff
 }
 
 src_compile() {
@@ -71,6 +74,13 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
 	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
 	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+
+	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
+	# are more or less the same.  -- Fabian Groffen (2005-06-30)
+	if use ppc-macos; then
+		rm -f ${D}/usr/lib/charset.alias
+		rm -f ${D}/usr/share/locale/locale.alias
+	fi
 }
 
 # disable it as the only test available is interactive..
diff --git a/www-client/elinks/files/elinks-osx-configure.diff b/www-client/elinks/files/elinks-osx-configure.diff
new file mode 100644
index 000000000000..a4cb74316ff1
--- /dev/null
+++ b/www-client/elinks/files/elinks-osx-configure.diff
@@ -0,0 +1,37 @@
+--- elinks-0.10.5/configure.orig	2005-07-02 17:36:19.000000000 +0200
++++ elinks-0.10.5/configure	2005-07-02 20:22:55.000000000 +0200
+@@ -3439,32 +3439,7 @@
+ 	echo "$ac_t""$HAVE_VARIADIC_MACROS" 1>&6
+ 
+ 
+-echo $ac_n "checking for -rdynamic""... $ac_c" 1>&6
+-echo "configure:3444: checking for -rdynamic" >&5
+-LDFLAGS_X="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -rdynamic"
+-cat > conftest.$ac_ext <<EOF
+-#line 3448 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  have_rdynamic=yes
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  have_rdynamic=no
+-fi
+-rm -f conftest*
+-test "$have_rdynamic" = no && LDFLAGS="$LDFLAGS_X"
+-echo "$ac_t""$have_rdynamic" 1>&6
+-
+-
++LDFLAGS="$LDFLAGS -Xlinker -m"
+ 
+ 	
+ 	HAVE_REGEX_H=yes;
+