Fix librep libtool mess instead of continuing to try to work around it

(Portage version: 1.589-cvs)

4 files changed, 40 insertions, 11 deletions

diff --git a/x11-libs/rep-gtk/ChangeLog b/x11-libs/rep-gtk/ChangeLog
index b511cfff1d7e..7ceab7d8dba5 100644
--- a/x11-libs/rep-gtk/ChangeLog
+++ b/x11-libs/rep-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/rep-gtk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.46 2005/09/02 19:28:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.47 2005/09/19 21:28:00 truedfx Exp $
+
+  19 Sep 2005; Harald van Dijk <truedfx@gentoo.org> +files/libtool.patch,
+  rep-gtk-0.18-r3.ebuild:
+  Fix librep libtool mess instead of continuing to try to work around it
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   rep-gtk-0.18-r2.ebuild:
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 91cabf7f3d3b..00c9aae560ea 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,15 +1,26 @@
-MD5 f9b1914f376de058f7cd3806fd676672 rep-gtk-0.17-r1.ebuild 1332
-MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 588de3fa06eed4001062ce82db30278b ChangeLog 6836
-MD5 6f6ad4ba424bffdebbb2cbaa49e0758b rep-gtk-0.18-r3.ebuild 1552
-MD5 f0dac5e0b7c4dd18ff70243c3aec997c rep-gtk-0.18-r1.ebuild 1564
+MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252
 MD5 28825bbf0baee564c0d855e629409549 rep-gtk-0.15-r3.ebuild 1083
+MD5 f9b1914f376de058f7cd3806fd676672 rep-gtk-0.17-r1.ebuild 1332
+MD5 f0dac5e0b7c4dd18ff70243c3aec997c rep-gtk-0.18-r1.ebuild 1564
 MD5 1b25b0a0c6fc5e9ce7f37370caa59685 rep-gtk-0.18-r2.ebuild 1663
-MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18-r2 64
+MD5 30ed73b63624b6e0f485ce2644130e8d rep-gtk-0.18-r3.ebuild 1586
+MD5 220aadeb6d56c63c76c4a8ee31e2099f files/digest-rep-gtk-0.15-r3 64
+MD5 07badea9837cd8a9183fae4ef3dcc012 files/digest-rep-gtk-0.17-r1 64
 MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18-r1 64
-MD5 7e43019a0be09f8a64bbc489fa63fd6a files/rep-gtk-0.18-gtk24.patch 1580
+MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18-r2 64
 MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18-r3 64
-MD5 07badea9837cd8a9183fae4ef3dcc012 files/digest-rep-gtk-0.17-r1 64
+MD5 b14db54a43a3368a629fd5611dcd2529 files/libtool.patch 522
 MD5 e46cf05f7e6b4bc7788ab928acda4d08 files/rep-gtk-0.17-64bit.patch 698
-MD5 220aadeb6d56c63c76c4a8ee31e2099f files/digest-rep-gtk-0.15-r3 64
+MD5 7e43019a0be09f8a64bbc489fa63fd6a files/rep-gtk-0.18-gtk24.patch 1580
 MD5 b240daed7b25f7875150b314db4f26d0 files/rep-gtk-0.18-gtk26.patch 623
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLyZWwnQyISwouHwRArC8AJ9UZ/Ez60tDxg0d7mU3uKyjfy0DpwCfcJmZ
+sS1DmhjLGQo8tp4AcRxEpdI=
+=Ea/M
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/rep-gtk/files/libtool.patch b/x11-libs/rep-gtk/files/libtool.patch
new file mode 100644
index 000000000000..b243f425f0ba
--- /dev/null
+++ b/x11-libs/rep-gtk/files/libtool.patch
@@ -0,0 +1,12 @@
+diff -ur rep-gtk-0.18.orig/Makefile.in rep-gtk-0.18/Makefile.in
+--- rep-gtk-0.18.orig/Makefile.in	2002-02-13 08:50:27.000000000 +0100
++++ rep-gtk-0.18/Makefile.in	2005-09-19 22:52:34.000000000 +0200
+@@ -84,7 +84,7 @@
+ 	rep compiler -f compile-batch $<
+ 
+ libglade-gnome-support.lo : libglade-support.c
+-	$(rep_LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) \
++	$(rep_LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) \
+ 	 @GNOME_LIBGLADE_CFLAGS@ -DGLADE_GNOME=1 $< -o $@
+ 
+ install : all installdirs
diff --git a/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild
index a4635f94222f..94c8c0306a9e 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.18-r3.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/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild,v 1.1 2005/09/01 19:33:55 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild,v 1.2 2005/09/19 21:28:00 truedfx Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -13,7 +13,7 @@ SLOT="gtk-2.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="gnome"
 
-DEPEND=">=dev-libs/librep-0.17-r2
+DEPEND=">=dev-libs/librep-0.13
 	>=dev-util/pkgconfig-0.12.0
 	>=gnome-base/libglade-2.0.0
 	>=x11-libs/gtk+-2.0.3
@@ -36,6 +36,8 @@ src_unpack() {
 	# longer available in recent versions of gtk, and sawfish doesn't use
 	# them anyway.  Bug 48439
 	epatch "${FILESDIR}/rep-gtk-0.18-gtk26.patch"
+
+	epatch "${FILESDIR}/libtool.patch"
 }
 
 src_compile() {