Use tc-getCC to solve libtool tag problems #70514

(Portage version: 2.0.51.20-r5)

8 files changed, 26 insertions, 127 deletions

diff --git a/x11-libs/rep-gtk/ChangeLog b/x11-libs/rep-gtk/ChangeLog
index 286b744bbf44..e6f732efa2e1 100644
--- a/x11-libs/rep-gtk/ChangeLog
+++ b/x11-libs/rep-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.36 2005/06/17 21:04:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.37 2005/06/23 01:26:24 agriffis Exp $
+
+*rep-gtk-0.18-r2 (23 Jun 2005)
+
+  23 Jun 2005; Aron Griffis <agriffis@gentoo.org> -rep-gtk-0.15-r3.ebuild,
+  -rep-gtk-0.17-r1.ebuild, -rep-gtk-0.18.ebuild, +rep-gtk-0.18-r2.ebuild:
+  Use tc-getCC to solve libtool tag problems #70514
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   rep-gtk-0.18-r1.ebuild:
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 0925bd389ee2..dc83fb756665 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,13 +1,11 @@
-MD5 ea8512744ddf9751615237ed0a700344 rep-gtk-0.18.ebuild 1428
-MD5 e6e8f23c3f86aabf461f2c02af3ba114 rep-gtk-0.17-r1.ebuild 1331
-MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
-MD5 4050eda5ada5fdda54ee2bc02102d267 ChangeLog 5448
+MD5 833ef1e80ea3a6fe08d27a75e8095c3c rep-gtk-0.18-r2.ebuild 1600
 MD5 f0dac5e0b7c4dd18ff70243c3aec997c rep-gtk-0.18-r1.ebuild 1564
-MD5 18c0650e89460e8f7e1c93650fb8970e rep-gtk-0.15-r3.ebuild 1083
+MD5 4050eda5ada5fdda54ee2bc02102d267 ChangeLog 5448
+MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
+MD5 b240daed7b25f7875150b314db4f26d0 files/rep-gtk-0.18-gtk26.patch 623
+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 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18-r2 64
 MD5 7e43019a0be09f8a64bbc489fa63fd6a files/rep-gtk-0.18-gtk24.patch 1580
-MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18 64
-MD5 07badea9837cd8a9183fae4ef3dcc012 files/digest-rep-gtk-0.17-r1 64
 MD5 e46cf05f7e6b4bc7788ab928acda4d08 files/rep-gtk-0.17-64bit.patch 698
-MD5 220aadeb6d56c63c76c4a8ee31e2099f files/digest-rep-gtk-0.15-r3 64
-MD5 b240daed7b25f7875150b314db4f26d0 files/rep-gtk-0.18-gtk26.patch 623
diff --git a/x11-libs/rep-gtk/files/digest-rep-gtk-0.15-r3 b/x11-libs/rep-gtk/files/digest-rep-gtk-0.15-r3
deleted file mode 100644
index 9c626b632cab..000000000000
--- a/x11-libs/rep-gtk/files/digest-rep-gtk-0.15-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e351980234c3220ed2ad031c9ad9448f rep-gtk-0.15.tar.gz 141241
diff --git a/x11-libs/rep-gtk/files/digest-rep-gtk-0.17-r1 b/x11-libs/rep-gtk/files/digest-rep-gtk-0.17-r1
deleted file mode 100644
index 96800f6343ce..000000000000
--- a/x11-libs/rep-gtk/files/digest-rep-gtk-0.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a7b4589f14ad89360863593f77232cf rep-gtk-0.17.tar.gz 140982
diff --git a/x11-libs/rep-gtk/files/digest-rep-gtk-0.18 b/x11-libs/rep-gtk/files/digest-rep-gtk-0.18-r2
index db7b0f1ea4d4..db7b0f1ea4d4 100644
--- a/x11-libs/rep-gtk/files/digest-rep-gtk-0.18
+++ b/x11-libs/rep-gtk/files/digest-rep-gtk-0.18-r2
diff --git a/x11-libs/rep-gtk/rep-gtk-0.15-r3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.15-r3.ebuild
deleted file mode 100644
index 81df6a7b9a00..000000000000
--- a/x11-libs/rep-gtk/rep-gtk-0.15-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 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.15-r3.ebuild,v 1.19 2004/06/24 22:07:56 agriffis Exp $
-
-IUSE="gnome"
-
-DESCRIPTION="GTK/GDK bindings for the librep Lisp environment"
-SRC_URI="mirror://sourceforge/rep-gtk/${P}.tar.gz"
-HOMEPAGE="http://rep-gtk.sourceforge.net/"
-
-SLOT="1.2"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc -ppc alpha"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=dev-libs/librep-0.13.4
-	gnome? ( <gnome-base/libglade-2
-		>=media-libs/gdk-pixbuf-0.11.0-r1 )"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	gnome? ( <gnome-base/libglade-2
-		>=media-libs/gdk-pixbuf-0.11.0-r1 )"
-
-src_compile() {
-	local myconf=""
-
-	if use gnome
-	then
-		myconf="--with-gnome --with-libglade"
-	else
-		myconf="--without-gnome \
-			--without-libglade \
-			--without-gdk-pixbuf \
-			--without-gnome-canvas-pixbuf"
-	fi
-
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS BUGS COPYING ChangeLog README* TODO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/x11-libs/rep-gtk/rep-gtk-0.17-r1.ebuild b/x11-libs/rep-gtk/rep-gtk-0.17-r1.ebuild
deleted file mode 100644
index aab9569d6a67..000000000000
--- a/x11-libs/rep-gtk/rep-gtk-0.17-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 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.17-r1.ebuild,v 1.8 2004/06/28 19:25:04 agriffis Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://rep-gtk.sourceforge.net/"
-SLOT="gtk-2.0"
-LICENSE="GPL-2"
-KEYWORDS="x86 alpha sparc -ppc"
-
-DEPEND="virtual/libc
-	>=dev-util/pkgconfig-0.12.0
-	>=x11-libs/gtk+-2.0.3
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/libbonoboui-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/libgnomecanvas-2.0.0
-	>=gnome-base/libglade-2.0.0
-	>=sys-devel/automake-1.6.1-r5
-	>=dev-libs/librep-0.13"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}     || die
-	epatch ${FILESDIR}/rep-gtk-0.17-64bit.patch || die
-}
-
-src_compile() {
-
-	./configure --host=${CHOST} \
-	    --prefix=/usr \
-	    --libexecdir=/usr/lib \
-		--with-gnome \
-		--with-libglade \
-		--with-gdk-pixbuf \
-	    --infodir=/usr/share/info || die
-
-	emake host_type=${CHOST} || die
-}
-
-src_install() {
-
-	make install \
-		host_type=${CHOST} \
-		installdir=${D}/usr/lib/rep/${CHOST} || die
-
-	cd ${S}
-	dodoc AUTHORS BUGS COPYING ChangeLog HACKING \
-		NEWS README* TODO
-}
-
diff --git a/x11-libs/rep-gtk/rep-gtk-0.18.ebuild b/x11-libs/rep-gtk/rep-gtk-0.18-r2.ebuild
index e3b12e1f06b6..ace296d17290 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.18.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.18-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.11 2004/08/30 19:17:17 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.18-r2.ebuild,v 1.1 2005/06/23 01:26:24 agriffis Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-IUSE=""
+IUSE="gnome"
 
 DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://rep-gtk.sourceforge.net/"
 SLOT="gtk-2.0"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha ia64 amd64 ~sparc ppc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc
 	>=dev-util/pkgconfig-0.12.0
@@ -33,17 +33,18 @@ src_unpack() {
 	if has_version '>=x11-libs/gtk+-2.4'; then
 		epatch ${FILESDIR}/rep-gtk-0.18-gtk24.patch
 	fi
+
+	# Remove reference to gtk internal functions.  These functions are no
+	# longer available in recent versions of gtk, and sawfish doesn't use
+	# them anyway.  Bug 48439, patch from fn_x
+	epatch ${FILESDIR}/rep-gtk-0.18-gtk26.patch
 }
 
 src_compile() {
-	./configure --host=${CHOST} \
-	    --prefix=/usr \
-	    --libexecdir=/usr/lib \
-		--with-gnome \
+	CC=$(tc-getCC) econf \
 		--with-libglade \
 		--with-gdk-pixbuf \
-	    --infodir=/usr/share/info || die
-
+		$(use_with gnome) || die
 	emake host_type=${CHOST} || die
 }