Lock to wxGTK-2.6 and use wxwidgets.eclass.

Package-Manager: portage-2.1.2.7

4 files changed, 43 insertions, 29 deletions

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index 48ca89cf1182..51e18604b425 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.28 2007/03/26 14:57:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.29 2007/05/14 01:46:59 dirtyepic Exp $
+
+  14 May 2007; Ryan Hill <dirtyepic@gentoo.org> crystalspace-1.0.ebuild,
+  crystalspace-1.0.1.ebuild:
+  Lock to wxGTK-2.6 and use wxwidgets.eclass.
+
+  14 May 2007; Ryan Hill <dirtyepic@gentoo.org> crystalspace-1.0.ebuild,
+  crystalspace-1.0.1.ebuild:
+  Lock to wxGTK-2.6 and use wxwidgets.eclass.
 
   26 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   crystalspace-0.98.4.ebuild:
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index cfb7df03cf24..74a082387e03 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX crystalspace-0.98.4-gl.patch 10653 RMD160 e0c5081631f755c914475093a0cd851045abffdc SHA1 f6ee2da908b6d67a152ded44589f6760041d19aa SHA256 f2286634415f4b0cddc0b202b692dc49df90897da730f2693c6a99be71f9bb36
 MD5 bb4bd5565667c14a0d7377fda90db568 files/crystalspace-0.98.4-gl.patch 10653
 RMD160 e0c5081631f755c914475093a0cd851045abffdc files/crystalspace-0.98.4-gl.patch 10653
@@ -12,18 +9,18 @@ EBUILD crystalspace-0.98.4.ebuild 1834 RMD160 e8f5a25e742e699d4b2396a4dc007819e0
 MD5 0e08102cee91ebb524d50344c56fc108 crystalspace-0.98.4.ebuild 1834
 RMD160 e8f5a25e742e699d4b2396a4dc007819e0575008 crystalspace-0.98.4.ebuild 1834
 SHA256 4889b94455ea5a23ea1be8aa3f7433b2546040361d8ffa2040ec86230ca135ae crystalspace-0.98.4.ebuild 1834
-EBUILD crystalspace-1.0.1.ebuild 3388 RMD160 60ded7ab895132e703d64f230776e9b5de563317 SHA1 84d7a9197172c455b001004db6d4837db0f68720 SHA256 499c2f975e9e68f46fd181d1393f73b7406fb1a8b3a8fbe4ebcc33f9fda11fcb
-MD5 ac117437635d351bb678418d7e4c1e26 crystalspace-1.0.1.ebuild 3388
-RMD160 60ded7ab895132e703d64f230776e9b5de563317 crystalspace-1.0.1.ebuild 3388
-SHA256 499c2f975e9e68f46fd181d1393f73b7406fb1a8b3a8fbe4ebcc33f9fda11fcb crystalspace-1.0.1.ebuild 3388
-EBUILD crystalspace-1.0.ebuild 3269 RMD160 bf694c7d763a6338d5c2570ed2c938d2c5903046 SHA1 74b5cd87ee9c2e75ea46a773a08cfabde2aaff05 SHA256 52f465935d1777b479a47870f780fb783b4f1a2e75a8972ece1a5fe600aacb90
-MD5 48ec48a56aaa1946540c82c03dddffe4 crystalspace-1.0.ebuild 3269
-RMD160 bf694c7d763a6338d5c2570ed2c938d2c5903046 crystalspace-1.0.ebuild 3269
-SHA256 52f465935d1777b479a47870f780fb783b4f1a2e75a8972ece1a5fe600aacb90 crystalspace-1.0.ebuild 3269
-MISC ChangeLog 4338 RMD160 ca2531916fdd117379061f2dc8ee1236d44e08be SHA1 9497cfa89c846ac04abdb5bfbf96e209a056a7f6 SHA256 ebe31a630d3f59fb88708495c9df0d828194170f4f45f08bb42d6aab884df639
-MD5 d4957d00487bdd1a1487a9b82037256a ChangeLog 4338
-RMD160 ca2531916fdd117379061f2dc8ee1236d44e08be ChangeLog 4338
-SHA256 ebe31a630d3f59fb88708495c9df0d828194170f4f45f08bb42d6aab884df639 ChangeLog 4338
+EBUILD crystalspace-1.0.1.ebuild 3573 RMD160 7c071d23b07bd0e83be9b5a23f473a4711a1c808 SHA1 585530d3f3fce0f9019430070831fa8b7c8d4b2e SHA256 0956f03c60df822b1331eec54ab3804df9195000a8195e4c96c1ba99ae6a2705
+MD5 cf64fe2202ffc4a22e5eb4285c106b51 crystalspace-1.0.1.ebuild 3573
+RMD160 7c071d23b07bd0e83be9b5a23f473a4711a1c808 crystalspace-1.0.1.ebuild 3573
+SHA256 0956f03c60df822b1331eec54ab3804df9195000a8195e4c96c1ba99ae6a2705 crystalspace-1.0.1.ebuild 3573
+EBUILD crystalspace-1.0.ebuild 3454 RMD160 31eb96aa68732439c6356b93e5fb21ef45581729 SHA1 f65066bda950a027b52bced7e39c5cfc6127a986 SHA256 23e68c3f187ce9196dd9cb7a836ce478603d6f637abed0d9fc604ef304ea1e9a
+MD5 2a2427faf2be523e50a54c6ad0aeeb6e crystalspace-1.0.ebuild 3454
+RMD160 31eb96aa68732439c6356b93e5fb21ef45581729 crystalspace-1.0.ebuild 3454
+SHA256 23e68c3f187ce9196dd9cb7a836ce478603d6f637abed0d9fc604ef304ea1e9a crystalspace-1.0.ebuild 3454
+MISC ChangeLog 4637 RMD160 3fb1cc215270f698bfe7821ce84c5addf3cc5d9b SHA1 34880dc2a3083806c3004e175e3af666597fafd5 SHA256 ac66eb253234745385d1a786c956eb97f063e0cbcfb1a08def6ce7e107df10c9
+MD5 e74419699d04e6b5c0669151d43da2a2 ChangeLog 4637
+RMD160 3fb1cc215270f698bfe7821ce84c5addf3cc5d9b ChangeLog 4637
+SHA256 ac66eb253234745385d1a786c956eb97f063e0cbcfb1a08def6ce7e107df10c9 ChangeLog 4637
 MISC metadata.xml 959 RMD160 40012c6a95c2e1d1edd4b801f2f1b3184965a94f SHA1 e4d00b523f67093c7b3b096523dd85b3c8c921a4 SHA256 c4214f73569fde7be988f76a25ce525814a0092d5a396cf1da57162d575a4325
 MD5 e4c7a49ca08eb200cfa0a9f9246e2257 metadata.xml 959
 RMD160 40012c6a95c2e1d1edd4b801f2f1b3184965a94f metadata.xml 959
@@ -37,10 +34,3 @@ SHA256 d9cee21b4e3c8de602272b4df4459a097cbb0c0ec3d3e59609a940b717c07836 files/di
 MD5 4fa6ce3a0bf3b9a3d5700f7d3a9d029e files/digest-crystalspace-1.0.1 277
 RMD160 35931fb48ca3a968a074b791ab73f79952bce013 files/digest-crystalspace-1.0.1 277
 SHA256 c2f369fc539c4f31777ef769273745183a7c671e9da414bfcc16dce328711916 files/digest-crystalspace-1.0.1 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGB99JkT4lNIS36YERAp83AJ0abSMMsrgvH/fjNxrYUqCsurXf8wCfeUhh
-d0gWpBHeg3TxcRkjPaO4bSE=
-=aw/p
------END PGP SIGNATURE-----
diff --git a/dev-games/crystalspace/crystalspace-1.0.1.ebuild b/dev-games/crystalspace/crystalspace-1.0.1.ebuild
index f016d0c6a4eb..031a17a15334 100644
--- a/dev-games/crystalspace/crystalspace-1.0.1.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.0.1.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/dev-games/crystalspace/crystalspace-1.0.1.ebuild,v 1.2 2007/03/04 07:50:54 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.0.1.ebuild,v 1.3 2007/05/14 01:46:59 dirtyepic Exp $
 
-inherit flag-o-matic java-pkg-opt-2 multilib
+inherit flag-o-matic java-pkg-opt-2 multilib wxwidgets
 
 MY_P=${PN}-src-${PV}
 DESCRIPTION="Portable 3D Game Development Kit written in C++"
@@ -30,7 +30,7 @@ RDEPEND="virtual/opengl
 	mng? ( media-libs/libmng )
 	png? ( media-libs/libpng )
 	wxwindows? ( x11-libs/pango
-		>=x11-libs/wxGTK-2.6 )
+		=x11-libs/wxGTK-2.6* )
 	javascript? ( dev-lang/spidermonkey )
 	cegui? ( >=dev-games/cegui-0.5.0 )
 	x11-libs/libXaw
@@ -57,6 +57,14 @@ src_unpack() {
 }
 
 src_compile() {
+	if useq wxwindows; then
+		WX_GTK_VER=2.6
+		need-wxwidgets gtk2
+		if [[ ! -e /usr/bin/wx-config ]]; then
+			sed -i -e "s:wx-config:${WX_CONFIG_NAME}:g" configure
+		fi
+	fi
+
 	# -O3 is hanging compilation of python script plugin
 	# trying -O2 just in case
 	replace-flags -O3 -O2
diff --git a/dev-games/crystalspace/crystalspace-1.0.ebuild b/dev-games/crystalspace/crystalspace-1.0.ebuild
index 89b0fea5d44c..7e6b6748b0b3 100644
--- a/dev-games/crystalspace/crystalspace-1.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.0.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/dev-games/crystalspace/crystalspace-1.0.ebuild,v 1.8 2007/03/04 07:50:54 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.0.ebuild,v 1.9 2007/05/14 01:46:59 dirtyepic Exp $
 
-inherit java-pkg-opt-2 multilib
+inherit java-pkg-opt-2 multilib wxwidgets
 
 MY_P=${PN}-src-${PV}
 DESCRIPTION="Portable 3D Game Development Kit written in C++"
@@ -30,7 +30,7 @@ RDEPEND="virtual/opengl
 	mng? ( media-libs/libmng )
 	png? ( media-libs/libpng )
 	wxwindows? ( x11-libs/pango
-		>=x11-libs/wxGTK-2.6 )
+		=x11-libs/wxGTK-2.6* )
 	javascript? ( dev-lang/spidermonkey )
 	cegui? ( >=dev-games/cegui-0.5.0 )
 	x11-libs/libXaw
@@ -57,6 +57,14 @@ src_unpack() {
 }
 
 src_compile() {
+	if useq wxwindows; then
+		WX_GTK_VER=2.6
+		need-wxwidgets gtk2
+		if [[ ! -e /usr/bin/wx-config ]]; then
+			sed -i -e "s:wx-config:${WX_CONFIG_NAME}:g" configure
+		fi
+	fi
+
 	econf --enable-cpu-specific-optimizations=no \
 		--disable-separate-debug-info \
 		--without-lcms \