Use wxwidgets.eclass.

Package-Manager: portage-2.1.2.7

7 files changed, 97 insertions, 55 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 272ef95c3a05..285ecc2e69ce 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.31 2007/03/27 05:29:11 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.32 2007/05/19 07:49:23 dirtyepic Exp $
+
+  19 May 2007; Ryan Hill <dirtyepic@gentoo.org>
+  boinc-4.72.20050813-r3.ebuild, boinc-5.2.14.ebuild, boinc-5.4.11.ebuild,
+  boinc-5.5.6.ebuild, boinc-5.8.15.ebuild:
+  Use wxwidgets.eclass.
 
 *boinc-5.8.15 (27 Mar 2007)
 
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 0c859494e019..9d4d71b56394 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 08_all_Makefile.patch 792 RMD160 b2126e243dc1c7b49e44740e67fe9b3b2aa9e6c3 SHA1 581132deec4ec3b305f8343aa4a12132e59d8e97 SHA256 bbbd219ac38491e0afb3d58d4a29eda79a30fdf4eed3f46cf18b66ce25f0b6df
 MD5 52c02ebc56426be6995963efa6cdd075 files/08_all_Makefile.patch 792
 RMD160 b2126e243dc1c7b49e44740e67fe9b3b2aa9e6c3 files/08_all_Makefile.patch 792
@@ -27,30 +24,30 @@ DIST boinc-5.4.11.tar.bz2 9604328 RMD160 5dc29d9720ca3bff6015991fbabe97929b4b1fb
 DIST boinc-5.5.6.tar.bz2 9211643 RMD160 f1fc9405184146bce972002332b6271ab6940849 SHA1 ca51c621306d42a9a09e5949f9e86a2af1102267 SHA256 a23b01016c3c6664ad1ec21b8731a4a2648b47a8ceac8bcc13f09f86af017194
 DIST boinc-5.8.15.tar.bz2 3544744 RMD160 cdeb0a544be911db3f1d505f6cd9eb7c8a4971cb SHA1 924af911f22ca175c78614a9da9177e430a9a61e SHA256 0e428af6a76dd41786f15c9de0a31a403613b2e366c0f5b950e2be266f82b902
 DIST boinc_public-cvs-2005-08-13.tar.gz 6054534 RMD160 2585effd13c1b6e093141dbc34bebd770c6041be SHA1 3c76cb8b00ad7e26fe05cfacfe135fd2fbaeb99d SHA256 3a8b7f3d462a0fa5f1d0ad14c77f790a3cf12b1237a09636cd82b9bfefc2afb7
-EBUILD boinc-4.72.20050813-r3.ebuild 2334 RMD160 364f2c55c4b69de7b45938011534d8e235b624fa SHA1 732fa3218e2662583718ebf6d90fc449353836f5 SHA256 7b0b0966c9b6d33efa7b6427a15de1d30667dda031702d564a3fa95689e053f2
-MD5 80576772e74bc5da186e75079095b0cc boinc-4.72.20050813-r3.ebuild 2334
-RMD160 364f2c55c4b69de7b45938011534d8e235b624fa boinc-4.72.20050813-r3.ebuild 2334
-SHA256 7b0b0966c9b6d33efa7b6427a15de1d30667dda031702d564a3fa95689e053f2 boinc-4.72.20050813-r3.ebuild 2334
-EBUILD boinc-5.2.14.ebuild 2729 RMD160 0d7968c055be69df86132a046b81b6771bfdb8f5 SHA1 1e48b852c5bc745dd4d06e00cf127fc87c6b9f19 SHA256 a6c627e2e36a9b6de358214fd92352334ea6030f7a00b99c35b667a8befe5755
-MD5 a8a0f06f07047ea879746066c7b2ff27 boinc-5.2.14.ebuild 2729
-RMD160 0d7968c055be69df86132a046b81b6771bfdb8f5 boinc-5.2.14.ebuild 2729
-SHA256 a6c627e2e36a9b6de358214fd92352334ea6030f7a00b99c35b667a8befe5755 boinc-5.2.14.ebuild 2729
-EBUILD boinc-5.4.11.ebuild 2720 RMD160 3d05fcfb596d3746864ec19fd4c16d71c4ef57a6 SHA1 a90e9862aaf0e69e34ce06301c668613f5996370 SHA256 d4592ad80cda1fa47908c65d8b578c123eeb483b11a9d1c096751a667cd86088
-MD5 1ab729ebb8c7fda295fbbf966288f184 boinc-5.4.11.ebuild 2720
-RMD160 3d05fcfb596d3746864ec19fd4c16d71c4ef57a6 boinc-5.4.11.ebuild 2720
-SHA256 d4592ad80cda1fa47908c65d8b578c123eeb483b11a9d1c096751a667cd86088 boinc-5.4.11.ebuild 2720
-EBUILD boinc-5.5.6.ebuild 2952 RMD160 9f066ecd72bc05e1e2fec9f3b96d5d8d411a24d8 SHA1 18e93e1f939c26c3c3f6e173e4f46474ebea59eb SHA256 545968a5dbd5eb2bc1f9287a1494eeecf52caca236c91668f92ecad3724717a5
-MD5 79373775f14446b97671dd01ab766c56 boinc-5.5.6.ebuild 2952
-RMD160 9f066ecd72bc05e1e2fec9f3b96d5d8d411a24d8 boinc-5.5.6.ebuild 2952
-SHA256 545968a5dbd5eb2bc1f9287a1494eeecf52caca236c91668f92ecad3724717a5 boinc-5.5.6.ebuild 2952
-EBUILD boinc-5.8.15.ebuild 3115 RMD160 6ab936ceae4acfe40d6099250138ac7e718aa847 SHA1 255d88b8622b53531bfeab956faae518ea2b37d3 SHA256 44c5db51ecb36b0cfd7256e15cea6332c9d33c65d5240b228b093bd21f14078e
-MD5 15bca39ee91f9d8d376db654e5467740 boinc-5.8.15.ebuild 3115
-RMD160 6ab936ceae4acfe40d6099250138ac7e718aa847 boinc-5.8.15.ebuild 3115
-SHA256 44c5db51ecb36b0cfd7256e15cea6332c9d33c65d5240b228b093bd21f14078e boinc-5.8.15.ebuild 3115
-MISC ChangeLog 6200 RMD160 3a80442a386f7e4b17cfbc33835c5e30aa760994 SHA1 488d7bfb41ff5e8c5d1191349c3d9700351876e7 SHA256 b589e13738832d56a0a7b7d3b1f2e056ee65326ccdd076f38e9c3b48c84906ec
-MD5 b534b4f397ad2ed8389822fd958e483c ChangeLog 6200
-RMD160 3a80442a386f7e4b17cfbc33835c5e30aa760994 ChangeLog 6200
-SHA256 b589e13738832d56a0a7b7d3b1f2e056ee65326ccdd076f38e9c3b48c84906ec ChangeLog 6200
+EBUILD boinc-4.72.20050813-r3.ebuild 2411 RMD160 9df760ee51517596a1380fd54cb2b0eb7620e79c SHA1 4b04dade1e7afa3194ccc19235d9caafe29e1afe SHA256 9e6a5334a412364c9139c5229865d3ec4ed3dd4e464af056fc92d19a9360a9fc
+MD5 93b43f53c8a81673ab8a547192502482 boinc-4.72.20050813-r3.ebuild 2411
+RMD160 9df760ee51517596a1380fd54cb2b0eb7620e79c boinc-4.72.20050813-r3.ebuild 2411
+SHA256 9e6a5334a412364c9139c5229865d3ec4ed3dd4e464af056fc92d19a9360a9fc boinc-4.72.20050813-r3.ebuild 2411
+EBUILD boinc-5.2.14.ebuild 2868 RMD160 73cbe36517b662c21dbd1e688bf01a0e3d0a89a0 SHA1 2a62a74161574892c02ce4bda63ff45dfb69a485 SHA256 8a7bd3bfe2a4fb89f727078b9bdec64a17fc613be9e9f9df63730680a9900ee3
+MD5 f45ff71ba64fbd84e1558e28d756271a boinc-5.2.14.ebuild 2868
+RMD160 73cbe36517b662c21dbd1e688bf01a0e3d0a89a0 boinc-5.2.14.ebuild 2868
+SHA256 8a7bd3bfe2a4fb89f727078b9bdec64a17fc613be9e9f9df63730680a9900ee3 boinc-5.2.14.ebuild 2868
+EBUILD boinc-5.4.11.ebuild 2859 RMD160 0799c15ff948fef2c83a4ef1b26a5dc050b6e51b SHA1 5364dff496b09e652d6de90be4887c4cd36349f2 SHA256 80e9547b7a15ea46a4c521ae1c9d229601259c394162f9d780caa39b61115342
+MD5 dc53bfb09439b80085bc92a0bbfeb0db boinc-5.4.11.ebuild 2859
+RMD160 0799c15ff948fef2c83a4ef1b26a5dc050b6e51b boinc-5.4.11.ebuild 2859
+SHA256 80e9547b7a15ea46a4c521ae1c9d229601259c394162f9d780caa39b61115342 boinc-5.4.11.ebuild 2859
+EBUILD boinc-5.5.6.ebuild 3091 RMD160 8552872048675170a08de2f6dcf079c8b002d6fc SHA1 3675950a9ec6cf74a203d2aef208c7dc3cd171b0 SHA256 4261ab182b80a1155dc33e0068eddcb21cb7594aaeee692e386b69d0b8b7dcb2
+MD5 e7108690192fffe2c8f08f8c4be5f908 boinc-5.5.6.ebuild 3091
+RMD160 8552872048675170a08de2f6dcf079c8b002d6fc boinc-5.5.6.ebuild 3091
+SHA256 4261ab182b80a1155dc33e0068eddcb21cb7594aaeee692e386b69d0b8b7dcb2 boinc-5.5.6.ebuild 3091
+EBUILD boinc-5.8.15.ebuild 3258 RMD160 1640fa6d05554845c387f24ff47aa6b7e3a712ac SHA1 62357bd21484d363ae55c10dc28bcb2e6a8e6e23 SHA256 f0671932272a2372e261b4ec9e1e04a4939aaa7343a27e533272fb21880f86cc
+MD5 c83832f9f3d322e83bbbc984bc7d9242 boinc-5.8.15.ebuild 3258
+RMD160 1640fa6d05554845c387f24ff47aa6b7e3a712ac boinc-5.8.15.ebuild 3258
+SHA256 f0671932272a2372e261b4ec9e1e04a4939aaa7343a27e533272fb21880f86cc boinc-5.8.15.ebuild 3258
+MISC ChangeLog 6394 RMD160 4d4ecdb51d8a5f24250b5098d0a646a13c6a93aa SHA1 af04f02eb3d87b4ee2706506cf4cf3708a9fdca5 SHA256 7990614ae6eaec8bdd03934657c6d0a8d94b5578d63e6b03b31986e45cde11f0
+MD5 9c6972c0ce6ced10d5d16ee3ee6a6936 ChangeLog 6394
+RMD160 4d4ecdb51d8a5f24250b5098d0a646a13c6a93aa ChangeLog 6394
+SHA256 7990614ae6eaec8bdd03934657c6d0a8d94b5578d63e6b03b31986e45cde11f0 ChangeLog 6394
 MISC metadata.xml 420 RMD160 ebfdfbe98b4616e68514dece1809bae66cb1d354 SHA1 2f2b723edf9a8b6d20c595d966dba7fc51674313 SHA256 166699fb3c8d9d6a371af9275ac5d9198d354042a5b4e4377247e4639a6fb085
 MD5 4b2e94b92c84896e0204d9e7710f9c6a metadata.xml 420
 RMD160 ebfdfbe98b4616e68514dece1809bae66cb1d354 metadata.xml 420
@@ -70,10 +67,3 @@ SHA256 0f81bcb58aea62e2b96ad074dd84f9f428f52340eaa9b8875ebbd939411a0e20 files/di
 MD5 adade25947a97f6afcfcff9b5cf3e641 files/digest-boinc-5.8.15 244
 RMD160 9069e63d279bcc50183c6153cc46490d76aa9f10 files/digest-boinc-5.8.15 244
 SHA256 e61648bea5a90f411a609cea63bcb957cd358de4ecd60dab9200b2b7eaf6443b files/digest-boinc-5.8.15 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGCKuo2ZWR0Jhg/EsRAhwfAJ4gMGBC7TN/42oaf/f7JyBCA7NSuACeNSat
-wtXkUBsDxrE22UjYJRpoyDA=
-=sPXk
------END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild b/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild
index c9bb104f2ebe..8d09bcf82816 100644
--- a/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild
+++ b/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild,v 1.6 2007/03/13 00:34:19 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild,v 1.7 2007/05/19 07:49:23 dirtyepic Exp $
 
-inherit eutils
+inherit eutils wxwidgets
 
 MY_PN="boinc_public-cvs"
 MY_PV="2005-08-13"
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="server X"
 
 RDEPEND="sys-libs/zlib
-	X? ( >=x11-libs/wxGTK-2.6.1 )
+	X? ( =x11-libs/wxGTK-2.6* )
 	server? ( net-www/apache
 		>=virtual/mysql-4.0
 		virtual/php
@@ -50,10 +50,16 @@ src_unpack() {
 }
 
 src_compile() {
+	if use X; then
+		WX_GTK_VER=2.6
+		need-wxwidgets gtk2
+		wxconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
 	econf \
 		--enable-client \
 		--disable-static-client \
-		--with-wx-config=$(type -P wx-config-2.6) \
+		${wxconf} \
 		$(use_enable server) \
 		$(use_with X x) || die "econf failed"
 	emake || die "emake failed"
diff --git a/sci-misc/boinc/boinc-5.2.14.ebuild b/sci-misc/boinc/boinc-5.2.14.ebuild
index cd634c07bde8..47e446ece7c0 100644
--- a/sci-misc/boinc/boinc-5.2.14.ebuild
+++ b/sci-misc/boinc/boinc-5.2.14.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.2.14.ebuild,v 1.8 2007/03/13 00:34:19 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.2.14.ebuild,v 1.9 2007/05/19 07:49:23 dirtyepic Exp $
 
-inherit eutils
+inherit eutils wxwidgets
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -17,7 +17,7 @@ IUSE="server X unicode"
 RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.0
 	>=dev-libs/openssl-0.9.7
-	X? ( >=x11-libs/wxGTK-2.6.2 )
+	X? ( =x11-libs/wxGTK-2.6* )
 	server? ( net-www/apache
 		>=virtual/mysql-4.0
 		virtual/php
@@ -51,10 +51,20 @@ src_unpack() {
 }
 
 src_compile() {
+	if use X; then
+		WX_GTK_VER=2.6
+		if use unicode; then
+			need-wxwidgets unicode
+		else
+			need-wxwidgets gtk2
+		fi
+		wxconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
 	econf \
 		--enable-client \
 		--disable-static-client \
-		--with-wx-config=$(type -P wx-config-2.6) \
+		${wxconf} \
 		$(use_enable unicode) \
 		$(use_enable server) \
 		$(use_with X x) || die "econf failed"
diff --git a/sci-misc/boinc/boinc-5.4.11.ebuild b/sci-misc/boinc/boinc-5.4.11.ebuild
index 44698fbf2f65..c900787e0af2 100644
--- a/sci-misc/boinc/boinc-5.4.11.ebuild
+++ b/sci-misc/boinc/boinc-5.4.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.4.11.ebuild,v 1.3 2007/03/13 00:34:19 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.4.11.ebuild,v 1.4 2007/05/19 07:49:23 dirtyepic Exp $
 
-inherit eutils
+inherit eutils wxwidgets
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -16,7 +16,7 @@ IUSE="server X unicode"
 RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.0
 	>=dev-libs/openssl-0.9.7
-	X? ( >=x11-libs/wxGTK-2.6.2 )
+	X? ( =x11-libs/wxGTK-2.6* )
 	server? ( net-www/apache
 		>=virtual/mysql-4.0
 		virtual/php
@@ -47,10 +47,20 @@ src_unpack() {
 }
 
 src_compile() {
+	if use X; then
+		WX_GTK_VER=2.6
+		if use unicode; then
+			need-wxwidgets unicode
+		else
+			need-wxwidgets gtk2
+		fi
+		wxconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
 	econf \
 		--enable-client \
 		--disable-static-client \
-		--with-wx-config=$(type -P wx-config-2.6) \
+		${wxconf} \
 		$(use_enable unicode) \
 		$(use_enable server) \
 		$(use_with X x) || die "econf failed"
diff --git a/sci-misc/boinc/boinc-5.5.6.ebuild b/sci-misc/boinc/boinc-5.5.6.ebuild
index 221266e7e29c..dcc07174f423 100644
--- a/sci-misc/boinc/boinc-5.5.6.ebuild
+++ b/sci-misc/boinc/boinc-5.5.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.5.6.ebuild,v 1.6 2007/03/13 00:34:19 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.5.6.ebuild,v 1.7 2007/05/19 07:49:23 dirtyepic Exp $
 
-inherit eutils
+inherit eutils wxwidgets
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -16,7 +16,7 @@ IUSE="server X unicode"
 RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.0
 	>=dev-libs/openssl-0.9.7
-	X? ( >=x11-libs/wxGTK-2.6.2 )
+	X? ( =x11-libs/wxGTK-2.6* )
 	server? ( net-www/apache
 		>=virtual/mysql-4.0
 		virtual/php
@@ -47,6 +47,16 @@ src_unpack() {
 }
 
 src_compile() {
+	if use X; then
+		WX_GTK_VER=2.6
+		if use unicode; then
+			need-wxwidgets unicode
+		else
+			need-wxwidgets gtk2
+		fi
+		wxconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
 	# Just run the necessary tools directly
 	einfo "Running necessary autotools..."
 	aclocal -I m4 || die "aclocal failed."
@@ -56,7 +66,7 @@ src_compile() {
 	econf \
 		--enable-client \
 		--disable-static-client \
-		--with-wx-config=$(type -P wx-config-2.6) \
+		${wxconf} \
 		$(use_enable unicode) \
 		$(use_enable server) \
 		$(use_with X x) || die "econf failed"
diff --git a/sci-misc/boinc/boinc-5.8.15.ebuild b/sci-misc/boinc/boinc-5.8.15.ebuild
index 55a0ca5e112b..f33b9bc16d38 100644
--- a/sci-misc/boinc/boinc-5.8.15.ebuild
+++ b/sci-misc/boinc/boinc-5.8.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.8.15.ebuild,v 1.1 2007/03/27 05:29:11 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.8.15.ebuild,v 1.2 2007/05/19 07:49:23 dirtyepic Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic wxwidgets
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -16,7 +16,7 @@ IUSE="server X unicode"
 RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.5
 	>=dev-libs/openssl-0.9.7
-	X? ( >=x11-libs/wxGTK-2.6.2 )
+	X? ( =x11-libs/wxGTK-2.6* )
 	server? ( net-www/apache
 		>=virtual/mysql-4.0
 		virtual/php
@@ -45,6 +45,17 @@ src_unpack() {
 
 src_compile() {
 	append-flags -O3 -funroll-loops -fforce-addr -ffast-math
+
+	if use X; then
+		WX_GTK_VER=2.6
+		if use unicode; then
+			need-wxwidgets unicode
+		else
+			need-wxwidgets gtk2
+		fi
+		wxconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
 	# Just run the necessary tools directly
 	#einfo "Running necessary autotools..."
 	#aclocal -I m4 || die "aclocal failed."
@@ -55,7 +66,7 @@ src_compile() {
 		--enable-client \
 		--disable-static-client \
 		--with-ssl \
-		--with-wx-config=$(type -P wx-config-2.6) \
+		${wxconf} \
 		$(use_enable unicode) \
 		$(use_enable server) \
 		$(use_with X x) || die "econf failed"