Fixed building with libtool >1.5.14 and on amd64, thanks to Joe Bormolini <lordjoe@bigfoot.com> from bug #93962 and to Ian Kumlien <pomac@vapor.com> from bug #94687

Package-Manager: portage-2.0.51.19

5 files changed, 127 insertions, 7 deletions

diff --git a/x11-plugins/gaim-extprefs/ChangeLog b/x11-plugins/gaim-extprefs/ChangeLog
index a113442e5abd..d242da743567 100644
--- a/x11-plugins/gaim-extprefs/ChangeLog
+++ b/x11-plugins/gaim-extprefs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/gaim-extprefs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/ChangeLog,v 1.8 2005/03/30 21:43:17 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/ChangeLog,v 1.9 2005/06/04 07:42:46 tester Exp $
+
+*gaim-extprefs-0.4-r1 (04 Jun 2005)
+
+  04 Jun 2005; Olivier Crête <tester@gentoo.org>
+  +files/gaim-extprefs-0.4-64bitfix.patch, +gaim-extprefs-0.4-r1.ebuild:
+  Fixed building with libtool >1.5.14 and on amd64, thanks to Joe Bormolini
+  <lordjoe@bigfoot.com> from bug #93962 and to Ian Kumlien <pomac@vapor.com>
+  from bug #94687
 
   30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gaim-extprefs-0.4.ebuild:
diff --git a/x11-plugins/gaim-extprefs/Manifest b/x11-plugins/gaim-extprefs/Manifest
index 82390d0fc6d8..f943583db440 100644
--- a/x11-plugins/gaim-extprefs/Manifest
+++ b/x11-plugins/gaim-extprefs/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1f07e2cd46e00b153d100b856e347799 ChangeLog 1121
-MD5 ada0fe081e6b55460c3ab3af792f3f86 gaim-extprefs-0.4.ebuild 837
 MD5 4e1932633984524faebd0664288510b9 metadata.xml 458
+MD5 ada0fe081e6b55460c3ab3af792f3f86 gaim-extprefs-0.4.ebuild 837
+MD5 731add91bf725d985194c9b91cd1e018 ChangeLog 1451
+MD5 a7149db71a3af1b560e26fcacc25608c gaim-extprefs-0.4-r1.ebuild 975
 MD5 8208e6ff994eddc392fee60515f96f43 files/digest-gaim-extprefs-0.4 68
+MD5 22d0ed82c098cff251a1abc3064b0a1b files/gaim-extprefs-0.4-64bitfix.patch 2611
+MD5 8208e6ff994eddc392fee60515f96f43 files/digest-gaim-extprefs-0.4-r1 68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCSx1/KRy60XGEcJIRAuPzAJoC5VaVk4Dewgg5/cuCOgUUSByY2wCfYbbm
-pxhxDt3bpdtd98qQWEmqtHQ=
-=/jXG
+iD8DBQFCoVu3mOfEJZHYOKcRArGkAJ4mo2dP5LeaDypywEgAM1aw3hgqWACg3uNR
+pHEfF3BJYAnb7PXczLfgH1I=
+=zLqr
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/gaim-extprefs/files/digest-gaim-extprefs-0.4-r1 b/x11-plugins/gaim-extprefs/files/digest-gaim-extprefs-0.4-r1
new file mode 100644
index 000000000000..ae42964cfb5e
--- /dev/null
+++ b/x11-plugins/gaim-extprefs/files/digest-gaim-extprefs-0.4-r1
@@ -0,0 +1 @@
+MD5 b7be99a49ff08c3b34f93e05544382f0 extendedprefs-0.4.tar.gz 14867
diff --git a/x11-plugins/gaim-extprefs/files/gaim-extprefs-0.4-64bitfix.patch b/x11-plugins/gaim-extprefs/files/gaim-extprefs-0.4-64bitfix.patch
new file mode 100644
index 000000000000..9a9106e229e2
--- /dev/null
+++ b/x11-plugins/gaim-extprefs/files/gaim-extprefs-0.4-64bitfix.patch
@@ -0,0 +1,66 @@
+diff -ruN extendedprefs-0.4/src/extendedprefs.c extendedprefs-0.4.pom/src/extendedprefs.c
+--- extendedprefs-0.4/src/extendedprefs.c	2004-12-14 05:38:46.000000000 +0100
++++ extendedprefs-0.4.pom/src/extendedprefs.c	2005-06-01 00:47:09.000000000 +0200
+@@ -337,7 +337,7 @@
+ 	blist_taskbar_update(NULL, 0, NULL, NULL);
+ 	blist_shrink_update(NULL, 0, NULL, NULL);
+ 
+-	if (gaim_prefs_get_bool(pref_blist_autohide) && (gboolean)data == TRUE) {
++	if (gaim_prefs_get_bool(pref_blist_autohide) && data != NULL) {
+ 		gtk_widget_hide(gtkblist->window);
+ 		logging_in = TRUE;
+ 
+@@ -437,28 +437,28 @@
+ 
+ 	/* Conversations */
+ 	gaim_gtk_prefs_labeled_spin_button(vbox, "_Conversations:",
+-									   pref_conv_size,
++									   (char *)pref_conv_size,
+ 									   KSTANGE_EP_SIZE_MIN,
+ 									   KSTANGE_EP_SIZE_MAX,
+ 									   sg);
+ 
+ 	/* Log Viewer Size */
+ 	gaim_gtk_prefs_labeled_spin_button(vbox, "Log _Viewer:",
+-									   pref_log_size,
++									   (char *)pref_log_size,
+ 									   KSTANGE_EP_SIZE_MIN,
+ 									   KSTANGE_EP_SIZE_MAX,
+ 									   sg);
+ 
+ 	/* Popup Dialogs */
+ 	gaim_gtk_prefs_labeled_spin_button(vbox, "Information _Dialogs:",
+-									   pref_popup_size,
++									   (char *)pref_popup_size,
+ 									   KSTANGE_EP_SIZE_MIN,
+ 									   KSTANGE_EP_SIZE_MAX,
+ 									   sg);
+ 
+ 	/* Buddy List Size */
+ 	gaim_gtk_prefs_labeled_spin_button(vbox, "Budd_y List:",
+-									   pref_blist_size,
++									   (char *)pref_blist_size,
+ 									   KSTANGE_EP_SIZE_MIN,
+ 									   KSTANGE_EP_SIZE_MAX,
+ 									   sg);
+@@ -497,7 +497,7 @@
+ 
+ 	/* Tooltip Delay */
+ 	gaim_gtk_prefs_labeled_spin_button(vbox, "_Tooltip reveal delay (ms):",
+-									   pref_tooltip_delay,
++									   (char *)pref_tooltip_delay,
+ 									   KSTANGE_EP_BLIST_TIP_MIN,
+ 									   KSTANGE_EP_BLIST_TIP_MAX,
+ 									   NULL);
+diff -ruN extendedprefs-0.4/src/Makefile extendedprefs-0.4.pom/src/Makefile
+--- extendedprefs-0.4/src/Makefile	2004-12-14 05:38:46.000000000 +0100
++++ extendedprefs-0.4.pom/src/Makefile	2005-06-01 00:48:32.000000000 +0200
+@@ -52,7 +52,7 @@
+ 	cp $(EP).so $(LIB_INSTALL_DIR)
+ 
+ $(EP).so: $(EP).c
+-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o tmp$@.lo $(GAIM_CFLAGS) $(GTK_CFLAGS) -DHAVE_CONFIG_H -DEP_VERSION=\\\"$(EP_VERSION)\\\"
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o tmp$@.lo $(GAIM_CFLAGS) $(GTK_CFLAGS) -DHAVE_CONFIG_H -DEP_VERSION=\"$(EP_VERSION)\"
+ 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(GAIM_LIBDIR) tmp$@.lo $(GAIM_LIBS) $(GTK_LIBS) -module -avoid-version
+ 	rm -f tmp$@.lo tmp$@.o libtmp$@.la
+ 	cp .libs/libtmp$@.so* $@
diff --git a/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild b/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild
new file mode 100644
index 000000000000..f9e848194f0d
--- /dev/null
+++ b/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild,v 1.1 2005/06/04 07:42:46 tester Exp $
+
+inherit eutils
+
+DESCRIPTION="Gaim Extended Preferences is a plugin that takes advantage of existing gaim functionality to provide preferences that are often desired but not are not considered worthy of inclusion in Gaim itself."
+
+HOMEPAGE="http://gaim-extprefs.sourceforge.net"
+
+SRC_URI="mirror://sourceforge/gaim-extprefs/extendedprefs-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+
+IUSE=""
+
+RDEPEND=">=net-im/gaim-1.0.0"
+
+DEPEND="${RDEPEND}
+	>sys-devel/libtool-1.5.14"
+
+S="${WORKDIR}/extendedprefs-${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch  ${FILESDIR}/${P}-64bitfix.patch
+}
+
+src_compile() {
+	#econf || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make PREFIX=${D}/usr install || die
+}