Fix compilation on amd64 (bug 104488) and remove gtk2 USE flag (bug 106560).

(Portage version: 2.0.52-r1)

5 files changed, 110 insertions, 5 deletions

diff --git a/x11-misc/gwhere/ChangeLog b/x11-misc/gwhere/ChangeLog
index 7d37d78905e6..eb3eae0f7291 100644
--- a/x11-misc/gwhere/ChangeLog
+++ b/x11-misc/gwhere/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/gwhere
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gwhere/ChangeLog,v 1.12 2005/09/17 02:00:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gwhere/ChangeLog,v 1.13 2005/10/01 15:14:25 nelchael Exp $
+
+*gwhere-0.2.1-r1 (01 Oct 2005)
+
+  01 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/gwhere-0.2.1-amd64.patch, +gwhere-0.2.1-r1.ebuild:
+  Fix compilation on amd64 (bug 104488) and remove gtk2 USE flag (bug 106560).
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gwhere-0.1.4.ebuild:
   Mark 0.1.4 stable on alpha
diff --git a/x11-misc/gwhere/Manifest b/x11-misc/gwhere/Manifest
index 0a1c83425708..4a6104d0309b 100644
--- a/x11-misc/gwhere/Manifest
+++ b/x11-misc/gwhere/Manifest
@@ -1,8 +1,11 @@
-MD5 93c8e87100085d36fc7e98350f1f2456 metadata.xml 589
-MD5 f608e26254377925ceaf6d8f459f480e ChangeLog 1963
-MD5 a5f7269c9c4d55728d724ba4ed4beefb gwhere-0.1.6.ebuild 774
 MD5 d9132553ff3ac58f55c5e909f4463f1d gwhere-0.1.4.ebuild 681
+MD5 a5f7269c9c4d55728d724ba4ed4beefb gwhere-0.1.6.ebuild 774
 MD5 a78742953fc8c62cb4bc374e8373bdce gwhere-0.2.1.ebuild 774
-MD5 7db74cd8b365250aac5babbbbde34b31 files/digest-gwhere-0.1.6 64
+MD5 f608e26254377925ceaf6d8f459f480e ChangeLog 1963
+MD5 93c8e87100085d36fc7e98350f1f2456 metadata.xml 589
+MD5 a6e6597529cfde8bfd34bac760729ad8 gwhere-0.2.1-r1.ebuild 887
 MD5 76c29b3fa9f746876c009f163028e826 files/digest-gwhere-0.1.4 64
+MD5 7db74cd8b365250aac5babbbbde34b31 files/digest-gwhere-0.1.6 64
 MD5 68210241b6b1c33b94a427a4fbb94b51 files/digest-gwhere-0.2.1 65
+MD5 68210241b6b1c33b94a427a4fbb94b51 files/digest-gwhere-0.2.1-r1 65
+MD5 9969b9959d1501275b4ec47fb75512d1 files/gwhere-0.2.1-amd64.patch 1937
diff --git a/x11-misc/gwhere/files/digest-gwhere-0.2.1-r1 b/x11-misc/gwhere/files/digest-gwhere-0.2.1-r1
new file mode 100644
index 000000000000..f5528ec6d6b7
--- /dev/null
+++ b/x11-misc/gwhere/files/digest-gwhere-0.2.1-r1
@@ -0,0 +1 @@
+MD5 12d8a1ab33a534a9c390f47952747efd gwhere-0.2.1.tar.gz 1075525
diff --git a/x11-misc/gwhere/files/gwhere-0.2.1-amd64.patch b/x11-misc/gwhere/files/gwhere-0.2.1-amd64.patch
new file mode 100644
index 000000000000..a7779c6f13bf
--- /dev/null
+++ b/x11-misc/gwhere/files/gwhere-0.2.1-amd64.patch
@@ -0,0 +1,59 @@
+diff -Nru gwhere-0.2.1.original/src/data/Makefile.am gwhere-0.2.1/src/data/Makefile.am
+--- gwhere-0.2.1.original/src/data/Makefile.am	2005-10-01 16:48:42.000000000 +0200
++++ gwhere-0.2.1/src/data/Makefile.am	2005-10-01 16:54:20.000000000 +0200
+@@ -4,7 +4,7 @@
+ 	-I$(top_srcdir)/intl \
+ 	-I$(top_srcdir)/src \
+ 	@GTK_CFLAGS@ \
+-	-D${HOST_OS}
++	-D${HOST_OS} -fPIC
+ 
+ noinst_LIBRARIES = libgwdata.a
+ 
+diff -Nru gwhere-0.2.1.original/src/db/Makefile.am gwhere-0.2.1/src/db/Makefile.am
+--- gwhere-0.2.1.original/src/db/Makefile.am	2005-10-01 16:48:42.000000000 +0200
++++ gwhere-0.2.1/src/db/Makefile.am	2005-10-01 16:54:08.000000000 +0200
+@@ -4,7 +4,7 @@
+ 	-I$(top_srcdir)/intl \
+ 	-I$(top_srcdir)/src \
+ 	@GTK_CFLAGS@ \
+-	-D${HOST_OS}
++	-D${HOST_OS} -fPIC
+ 
+ noinst_LIBRARIES = libgwdb.a
+ 
+diff -Nru gwhere-0.2.1.original/src/main.c gwhere-0.2.1/src/main.c
+--- gwhere-0.2.1.original/src/main.c	2005-10-01 16:48:42.000000000 +0200
++++ gwhere-0.2.1/src/main.c	2005-10-01 16:48:52.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <glib.h>
+ 
+ #include <stdlib.h>
++#include <locale.h>
+ 
+ #if defined ( OS_WIN32)
+ 	#include <windows.h>
+diff -Nru gwhere-0.2.1.original/src/plugins/Makefile.am gwhere-0.2.1/src/plugins/Makefile.am
+--- gwhere-0.2.1.original/src/plugins/Makefile.am	2005-10-01 16:48:42.000000000 +0200
++++ gwhere-0.2.1/src/plugins/Makefile.am	2005-10-01 16:56:12.000000000 +0200
+@@ -5,7 +5,7 @@
+ 	-I$(top_srcdir)/intl \
+ 	-I$(top_srcdir)/src \
+ 	@GTK_CFLAGS@ \
+-	-D${HOST_OS}
++	-D${HOST_OS} -fPIC
+ 
+ noinst_LIBRARIES = libgwplugins.a
+ 
+diff -Nru gwhere-0.2.1.original/src/tools/Makefile.am gwhere-0.2.1/src/tools/Makefile.am
+--- gwhere-0.2.1.original/src/tools/Makefile.am	2005-10-01 16:48:42.000000000 +0200
++++ gwhere-0.2.1/src/tools/Makefile.am	2005-10-01 16:51:59.000000000 +0200
+@@ -4,7 +4,7 @@
+ 	-I$(top_srcdir)/intl \
+ 	-I$(top_srcdir)/src \
+ 	@GTK_CFLAGS@ \
+-	-D${HOST_OS}
++	-D${HOST_OS} -fPIC
+ 
+ noinst_LIBRARIES = libgwtools.a
+ 
diff --git a/x11-misc/gwhere/gwhere-0.2.1-r1.ebuild b/x11-misc/gwhere/gwhere-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..324231b4ef74
--- /dev/null
+++ b/x11-misc/gwhere/gwhere-0.2.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gwhere/gwhere-0.2.1-r1.ebuild,v 1.1 2005/10/01 15:14:25 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Removable media cataloger made with GTK+"
+HOMEPAGE="http://www.gwhere.org/"
+SRC_URI="http://www.gwhere.org/download/source/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="nls"
+
+DEPEND="=x11-libs/gtk+-2*
+		nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	if [ "${ARCH}" = "amd64" ]; then
+		epatch ${FILESDIR}/${P}-amd64.patch
+	fi
+}
+
+src_compile() {
+	econf $(use_enable nls) --enable-gtk20 || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	# einstall is needed here
+	einstall || die "einstall failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO || die "dodoc failed"
+}