Fix building on OS X #107428.

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 9785360397ce77d79e98625f05c86ab46ff2731a..4d133511eef85b3d31b4652d91b340343f4b0eff 100644 (file)
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,9 +1,9 @@
+MD5 ad83592db497981e95509d1b20682b82 jbigkit-1.6-r1.ebuild 1209
 MD5 4e84e1e79ca429311ce5af75fb72c3c5 jbigkit-1.6.ebuild 1016
-MD5 ac50fc297e6708502984fa5a3627877a ChangeLog 2104
-MD5 7264520560293a07d116a72def08f68c jbigkit-1.6-r1.ebuild 1128
 MD5 f38ae5389c51dc49e9046dc00c043403 jbigkit-1.4.ebuild 1111
-MD5 b5fa036877461225b796e1bab1fb2179 files/jbigkit-1.6-build.patch 284
-MD5 3b69012688770808e2d9ebaf7d43533e files/digest-jbigkit-1.4 63
+MD5 ac50fc297e6708502984fa5a3627877a ChangeLog 2104
 MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6 63
 MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6-r1 63
+MD5 b5fa036877461225b796e1bab1fb2179 files/jbigkit-1.6-build.patch 284
+MD5 3b69012688770808e2d9ebaf7d43533e files/digest-jbigkit-1.4 63
 MD5 2ff843b8334471263691dcd0f6e7cff4 files/jbigkit-1.6-shared-lib.patch 1218

diff --git a/media-libs/urt/ChangeLog b/media-libs/urt/ChangeLog
index 2e73a6e6e81bbfc4fa6c7ece4cd340f5dad64cab..8a0d334f2b12ac7b5bed4d676e0610697419e1b2 100644 (file)
--- a/media-libs/urt/ChangeLog
+++ b/media-libs/urt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/urt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.6 2005/10/02 02:14:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.7 2005/10/04 00:36:15 vapier Exp $
+
+  04 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/urt-3.1b-build-fixes.patch, urt-3.1b-r1.ebuild:
+  Fix building on OS X #107428.
 
   02 Oct 2005; Jason Wever <weeve@gentoo.org> urt-3.1b-r1.ebuild:
   Added ~sparc keyword wrt bug #107346.

diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 388a301cbd041f4854a241d36d832f6b95408955..cf60e77659f5755d250d0c1f41389257bc217c9c 100644 (file)
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -1,8 +1,19 @@
-MD5 0af173cdd6c2f69ed6044f933caf82a0 ChangeLog 1160
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 f8236453d3052fcfd24d20f88291331c urt-3.1b-r1.ebuild 1563
-MD5 5cf67043e6b90e68277ec2c02066556f files/gentoo-config 670
-MD5 3f2cd2217e501f325bdc547781337c5c files/urt-3.1b-compile-updates.patch 3397
-MD5 17ad983b2b258ee3e633108e342276c1 files/urt-3.1b-rle-fixes.patch 5072
+MD5 a4807eb65a4931938662c55a8e92edf9 urt-3.1b-r1.ebuild 1731
+MD5 b33546756e2b39fcd72b66afda68d1a2 ChangeLog 1301
 MD5 eb209f87460fb61c12f96550740045e8 files/urt-3.1b-tempfile.patch 593
+MD5 17ad983b2b258ee3e633108e342276c1 files/urt-3.1b-rle-fixes.patch 5072
+MD5 3f2cd2217e501f325bdc547781337c5c files/urt-3.1b-compile-updates.patch 3397
+MD5 5cf67043e6b90e68277ec2c02066556f files/gentoo-config 670
+MD5 95677aac597cb74671547777ca82e9e5 files/urt-3.1b-build-fixes.patch 350
 MD5 6f003bc3da29163d55742e87559a3a87 files/digest-urt-3.1b-r1 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQc7TgIKl8Uu19MoRAit5AJ4oIjv2LoeKMV4B+ZxXfYlHQHlddQCeP+9p
+zZBlVMy70hUechUgQCVixc0=
+=QNg2
+-----END PGP SIGNATURE-----

diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
new file mode 100644 (file)
index 0000000..4623572
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-build-fixes.patch
@@ -0,0 +1,16 @@
+some hosts are more anal about ar usage than others
+
+http://bugs.gentoo.org/107428
+
+--- lib/makefile.src
++++ lib/makefile.src
+@@ -181,8 +181,7 @@
+ # Rebuild the library from all the .o files.
+ buildlib: $(OBJS)
+       -rm -f $(LIBNAME)
+-      ar rc $(LIBNAME)
+-      ar q $(LIBNAME) $(OBJS)
++      ar rc $(LIBNAME) $(OBJS)
+ #ifndef NO_RANLIB
+       ranlib $(LIBNAME)
+ #endif

diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index 56c12ee7ab3c2f1d1396e2fbafe311a38ba27ece..b40598dc9fcd38aa26c760853a3a7665988cb239 100644 (file)
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-r1.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/media-libs/urt/urt-3.1b-r1.ebuild,v 1.3 2005/10/02 02:14:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/urt-3.1b-r1.ebuild,v 1.4 2005/10/04 00:36:15 vapier Exp $
 
 inherit eutils
 
@@ -32,6 +32,10 @@ src_unpack() {
        epatch "${FILESDIR}"/${P}-rle-fixes.patch
        epatch "${FILESDIR}"/${P}-compile-updates.patch
        epatch "${FILESDIR}"/${P}-tempfile.patch
+       epatch "${FILESDIR}"/${P}-build-fixes.patch
+
+       # stupid OS X declares a stack_t type already #107428
+       sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die
 
        sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr
        cp "${FILESDIR}"/gentoo-config config/gentoo