unicode wxGTK blocking added (or fixed).

7 files changed, 63 insertions, 30 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index b5f95c758205..c39b6de9dbf4 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.13 2004/02/26 21:22:23 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.14 2004/02/28 09:12:38 eradicator Exp $
 
 *amule-1.2.6 (26 Feb 2004)
 
   26 Feb 2004; Martin Holzer <mholzer@gentoo.org> amule-1.2.6.ebuild:
   Version bumped. closes 43013
 
+  28 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> amule-1.1.0.ebuild,
+  amule-1.1.2.ebuild, amule-1.2.3.ebuild, amule-1.2.4.ebuild,
+  amule-1.2.5.ebuild:
+  unicode wxGTK blocking added (or fixed).
+
 *amule-1.2.5 (11 Feb 2004)
 
   11 Feb 2004; Martin Holzer <mholzer@gentoo.org> amule-1.2.5.ebuild:
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 5ec51bc76dc1..9070ee9c5a71 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,14 +1,14 @@
-MD5 541bce47c80b03c04bfb26784f25ad96 amule-1.2.4.ebuild 679
-MD5 c772bc486e601f6009078725482e3ee5 amule-1.1.2.ebuild 1104
-MD5 ac0c9d2808803e2f22827f96d496857a amule-1.2.5.ebuild 680
-MD5 ba7ccc35b62d65b78c3dec63e2943928 amule-1.1.0.ebuild 979
-MD5 5476a6661c01e8a9494cfbdb131f5f61 amule-1.2.3.ebuild 706
+MD5 45160167840b21a65a6b9c3c79ad3037 amule-1.1.2.ebuild 1140
+MD5 2cee8c802b04286b3d5a6b2b12ae28b1 amule-1.2.5.ebuild 1040
+MD5 48512f05faced9924ae23d3189b91f46 amule-1.2.4.ebuild 1040
 MD5 d03768ab8b98f5b9b02f995a06150d1b amule-1.2.6.ebuild 681
+MD5 b36c3e558b37e0b34037af1e6cef5b4a amule-1.1.0.ebuild 1016
+MD5 5c177ef5db4d9ea510b03168573522e8 ChangeLog 2262
+MD5 48196f9086047dcf34861f420f193753 amule-1.2.3.ebuild 1066
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 baf01ea89a44b91c2e1fdc644c13bc3b ChangeLog 2054
-MD5 c800dff573ca2cf757e3e65b7a8c5ea6 files/digest-amule-1.2.5 65
 MD5 1f788e567786e2aefb362559593e827a files/digest-amule-1.1.0 65
-MD5 a301972585e39355d61f9dcc8daaab86 files/digest-amule-1.2.6 65
-MD5 45fb221438495b8b009f301fb05e2761 files/digest-amule-1.2.4 65
 MD5 d7d7f67407285123a636467ef9160324 files/digest-amule-1.1.2 65
 MD5 c017d62483301d503a37effb14164166 files/digest-amule-1.2.3 65
+MD5 45fb221438495b8b009f301fb05e2761 files/digest-amule-1.2.4 65
+MD5 c800dff573ca2cf757e3e65b7a8c5ea6 files/digest-amule-1.2.5 65
+MD5 a301972585e39355d61f9dcc8daaab86 files/digest-amule-1.2.6 65
diff --git a/net-p2p/amule/amule-1.1.0.ebuild b/net-p2p/amule/amule-1.1.0.ebuild
index 3ed7c94c6f3a..b5ad95e6504e 100644
--- a/net-p2p/amule/amule-1.1.0.ebuild
+++ b/net-p2p/amule/amule-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.1.0.ebuild,v 1.3 2003/12/06 16:22:39 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.1.0.ebuild,v 1.4 2004/02/28 09:12:38 eradicator Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -20,13 +20,12 @@ DEPEND=">=x11-libs/wxGTK-2.4.1
 	>=sys-libs/zlib-1.1.4"
 
 pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
+	if wx-config --cppflags | grep gtk2u >& /dev/null; then
+		einfo "${PN} will not build if wxGTK was compiled"
+		einfo "with unicode support.  If you are using a version of"
+		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
+		einfo "you must set USE=-unicode."
+		die "wxGTK must be re-emerged without unicode suport"
 	fi
 }
 
diff --git a/net-p2p/amule/amule-1.1.2.ebuild b/net-p2p/amule/amule-1.1.2.ebuild
index 77ff2876a11e..3fd20dc12c54 100644
--- a/net-p2p/amule/amule-1.1.2.ebuild
+++ b/net-p2p/amule/amule-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.1.2.ebuild,v 1.5 2004/01/30 07:13:20 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.1.2.ebuild,v 1.6 2004/02/28 09:12:38 eradicator Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -22,13 +22,12 @@ DEPEND="$RDEPEND
 	>=sys-devel/autoconf-2.58"
 
 pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
+	if wx-config --cppflags | grep gtk2u >& /dev/null; then
+		einfo "${PN} will not build if wxGTK was compiled"
+		einfo "with unicode support.  If you are using a version of"
+		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
+		einfo "you must set USE=-unicode."
+		die "wxGTK must be re-emerged without unicode suport"
 	fi
 }
 
diff --git a/net-p2p/amule/amule-1.2.3.ebuild b/net-p2p/amule/amule-1.2.3.ebuild
index 1abb6bb5786f..234c8f56f18a 100644
--- a/net-p2p/amule/amule-1.2.3.ebuild
+++ b/net-p2p/amule/amule-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.3.ebuild,v 1.3 2004/01/07 22:52:24 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.3.ebuild,v 1.4 2004/02/28 09:12:38 eradicator Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -20,6 +20,16 @@ DEPEND=">=x11-libs/wxGTK-2.4.1
 	>=net-ftp/curl-7.9.7
 	>=sys-libs/zlib-1.2.1"
 
+pkg_setup() {
+	if wx-config --cppflags | grep gtk2u >& /dev/null; then
+		einfo "${PN} will not build if wxGTK was compiled"
+		einfo "with unicode support.  If you are using a version of"
+		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
+		einfo "you must set USE=-unicode."
+		die "wxGTK must be re-emerged without unicode suport"
+	fi
+}
+
 src_compile () {
 	econf `use_enable nls` || die
 	MAKEOPTS="${MAKEOPTS} -j1" emake || die
diff --git a/net-p2p/amule/amule-1.2.4.ebuild b/net-p2p/amule/amule-1.2.4.ebuild
index 7f77ff69c087..c04eaf26053a 100644
--- a/net-p2p/amule/amule-1.2.4.ebuild
+++ b/net-p2p/amule/amule-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.4.ebuild,v 1.2 2004/01/26 01:02:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.4.ebuild,v 1.3 2004/02/28 09:12:38 eradicator Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -19,6 +19,16 @@ DEPEND=">=x11-libs/wxGTK-2.4.1
 	>=net-ftp/curl-7.9.7
 	>=sys-libs/zlib-1.2.1"
 
+pkg_setup() {
+	if wx-config --cppflags | grep gtk2u >& /dev/null; then
+		einfo "${PN} will not build if wxGTK was compiled"
+		einfo "with unicode support.  If you are using a version of"
+		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
+		einfo "you must set USE=-unicode."
+		die "wxGTK must be re-emerged without unicode suport"
+	fi
+}
+
 src_compile() {
 	econf `use_enable nls` || die
 	emake -j1 || die
diff --git a/net-p2p/amule/amule-1.2.5.ebuild b/net-p2p/amule/amule-1.2.5.ebuild
index 56ba1da9d4d7..7a102cee32b6 100644
--- a/net-p2p/amule/amule-1.2.5.ebuild
+++ b/net-p2p/amule/amule-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.5.ebuild,v 1.1 2004/02/11 20:31:17 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.5.ebuild,v 1.2 2004/02/28 09:12:38 eradicator Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -19,6 +19,16 @@ DEPEND=">=x11-libs/wxGTK-2.4.1
 	>=net-ftp/curl-7.9.7
 	>=sys-libs/zlib-1.2.1"
 
+pkg_setup() {
+	if wx-config --cppflags | grep gtk2u >& /dev/null; then
+		einfo "${PN} will not build if wxGTK was compiled"
+		einfo "with unicode support.  If you are using a version of"
+		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
+		einfo "you must set USE=-unicode."
+		die "wxGTK must be re-emerged without unicode suport"
+	fi
+}
+
 src_compile() {
 	econf `use_enable nls` || die
 	emake -j1 || die