underlinkg patch not needed anymore (fixes bug 426530), source only compiles on >=sys-devel/gcc-4.6 add check, dropped autotools eclass and eautoreconf

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

4 files changed, 36 insertions, 19 deletions

diff --git a/games-board/openyahtzee/ChangeLog b/games-board/openyahtzee/ChangeLog
index 8dfe98a40ec1..3e96cdc632b1 100644
--- a/games-board/openyahtzee/ChangeLog
+++ b/games-board/openyahtzee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/openyahtzee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/ChangeLog,v 1.14 2012/07/11 21:26:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/ChangeLog,v 1.15 2012/07/14 19:29:04 hasufell Exp $
+
+  14 Jul 2012; Julian Ospald <hasufell@gentoo.org> openyahtzee-1.9.1.ebuild,
+  -files/openyahtzee-1.9.1-underlink.patch:
+  underlinkg patch not needed anymore (fixes bug 426530), source only compiles
+  on >=sys-devel/gcc-4.6 add check, dropped autotools eclass and eautoreconf
 
 *openyahtzee-1.9.1 (11 Jul 2012)
 
diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index 9008e6d62429..1f0a689e5fba 100644
--- a/games-board/openyahtzee/Manifest
+++ b/games-board/openyahtzee/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openyahtzee-1.9-gcc45.patch 633 SHA256 7eea9a893c388b16f43a0970ff1e0ac9de60a681db5fe372bc7bb511d0edace6 SHA512 45ada501d8d1e0e109b8e5adb772dce8fc17353cb4cfb2dca3c5d0b3f11f8b68b09af0f964e7505803cf0d1b7d7b1bd1aeb6550b3ad6e7ec2a88af926e0aef25 WHIRLPOOL 61bec69a35a90e1b8b3e897aef2eb15fcf1e27fe05c9318c6773f0cfdcb26fabd15fff34244c17bd63e36a232561cd78690fdd28aebf4b736c2a3fbc2d54af81
 AUX openyahtzee-1.9-underlink.patch 251 SHA256 59dc38a979b6ae7593b1fb93992ada1d982f7e6cc8d355932d9f328c7692335d SHA512 2dc8d41eb75f83b43dcdbfd0f291c0156cecb3f28816d158857034424bae6fcc38a4545e71a9ce3eb8d5d0efbbefd7c166be32320e0d093937d4408e9ad2a94a WHIRLPOOL bc03332fafecdb4c0c03cac7f34742d556dc0775e972f4862d1830e322e570dc78e6e2f326e3cd0bf7bd9796bc8aa73f354836dc51a7d09bdc2ae3ef251be53e
-AUX openyahtzee-1.9.1-underlink.patch 251 SHA256 59dc38a979b6ae7593b1fb93992ada1d982f7e6cc8d355932d9f328c7692335d SHA512 2dc8d41eb75f83b43dcdbfd0f291c0156cecb3f28816d158857034424bae6fcc38a4545e71a9ce3eb8d5d0efbbefd7c166be32320e0d093937d4408e9ad2a94a WHIRLPOOL bc03332fafecdb4c0c03cac7f34742d556dc0775e972f4862d1830e322e570dc78e6e2f326e3cd0bf7bd9796bc8aa73f354836dc51a7d09bdc2ae3ef251be53e
 DIST openyahtzee-1.9.1.tar.bz2 159149 SHA256 aa553a248d30ba259abb8dee735d5728bfdbb8d4705805bc716453245f1cb0a0 SHA512 2833a7085bb03d157b58a5e3a95c03b8a51cc8b527aec204188c8f773c492f4822655ec15dbedd4330c25bc4382132694ae7d3935dfb27756e859149ab66ef59 WHIRLPOOL 8c9986f163576d2d5ab31ea4083139645513c6d3e1a171cba9cb7030186a2f022984e8a9925f7524e2b25b9c7ad3a989eb39bb76b13642cef848e66daabfa86d
-DIST openyahtzee-1.9.tar.bz2 850969 RMD160 992ca4559a0cc7ed925f0b44bd989514a8410405 SHA1 6c9ff016f8f91550a879ec25409b119ef93b82dd SHA256 9d923dc14906aed39d9fa9d9c40eaa2d977d2d8aadae85836e7412712c93d8e1
-EBUILD openyahtzee-1.9.1.ebuild 809 SHA256 e5ae1d5c19209684705821ef59561f56efd8654253d0d5aa403f1be339037486 SHA512 1ef366a17787ff60e0e2f28c1f3a040b6030ba0e5b390b66605635013f669c101d0d63e3729b76c5de4b465fc255521ad5d584c832cec69d711ba1b2343dc047 WHIRLPOOL b442609ae6f783224b47a0f6d67dd1a99242bb23fd73c55f875300bb881e311b4cb758752e32024e227a9692b3c1ff1f9d6de996f7089eb449dc182596c07455
+DIST openyahtzee-1.9.tar.bz2 850969 SHA256 9d923dc14906aed39d9fa9d9c40eaa2d977d2d8aadae85836e7412712c93d8e1 SHA512 c3a164530fbdedf5192db8a05c01a4ce93485ab76b5779d8ab4bd7ca4e3b23c203dd6a27b2fd57d42061e585905003cab00964c926fadc505f1eddbcccf4e6fa WHIRLPOOL 34627b3f92b7ca5cee3bc948c7d4b6958a8463547592ba8adf9e02f3dde762d21b1fa9f7a515a95db6b61a5dfe34841961a7005fb19d008c3dc14ebe5e5c45bc
+EBUILD openyahtzee-1.9.1.ebuild 1002 SHA256 b23bdea5c02e5813799e1ac2eaaff8b1bf6a5d782943f6c9ca7552b6411d2081 SHA512 3d8c3681ad0a1128cb0ebde1792e50c3ba8b3497b4d3c227eb454f26516df1c46d3def5adde43e6bb285d6e25ddc59027d117f1ae7ffa56f2b10a63c9a2b60c6 WHIRLPOOL 925c53e8b9e2b15a67352cd69f314d724c8fda0466087821079914d63c4efd2aa7142256ae053271f98288266e4c53b544617b2fa6abe048b90631f765d6a509
 EBUILD openyahtzee-1.9.ebuild 860 SHA256 f82dd8b283a738bd1933727eb007005aa34b29ad106763c6857b65a97af61d06 SHA512 c6ef2f1ff42ee5166c9ff32bda537e418e1bf0f3c8ea91cc1d29f9232998667937e9be36cf1446f7a97913b4cb3df6ba7e1259968b2f6d092099ff5d72f95c93 WHIRLPOOL 127cea224af4c1547a5cf484ffe5cae91136df28e652ecf6e547cb41b80cb23f292f7a19405b09dc50b928c9584b25d5bcaa5741700c547cd96ab41f065396b9
-MISC ChangeLog 2182 SHA256 db63e36e003e1e4b5d6d29269221a45df8f8e1ec5229dc09244cc137cb329e70 SHA512 1e06f56fc6968fb78911f5c6da376bccb171322f9d11eec5e548c747c182a5c07141a2282e395670d58d564125cb9ba314d51b6a5c07bcf01d547f98717fdbba WHIRLPOOL 57979e3610d77d867ff26feca3152c8ebbe8b864f9d92128d9bc30c554dae6f73c5212cec9dd543d8c6478609c90f091dd16dad83b02fa095e111adca4ab53a7
+MISC ChangeLog 2459 SHA256 f078fa0d4671944373c29219d9154729facbf6e3a6157ff374a10719b2694ca6 SHA512 825460cb313214227f4e5857cc28d9ae649ef8aea28d47ff052cdc94a6dca16373c9ffc7d8498c8344b369d3d9fad866748dd6d2be5ef6e3aaa5d94e6954baa6 WHIRLPOOL cfc40d57cd3263e5e74d6c1f31230802899827bf41dc8f02f2193b1fcca49dd6918a0e295a19bd89fab58f580f54d8cb37dba1a7c8b80ed52a8a6970f4061904
 MISC metadata.xml 285 SHA256 b91d53b74f4f7cba24004810d60dce73807300ed0e933001d44ee7896426f5c1 SHA512 866c08a24e0f8b26548a2bb0bf6185cc6a8c3fb5cc0490cdd639a9e7b65c10ecb001a82595196be372ab09ee20d6999237ab4e7f5f259e7f39567682cd9514ef WHIRLPOOL 0f9e16215eeb73b7bc7dae35d76f0d19b2f6b17479a719808627db5aac01868f6876be309b148139ac9f2e8984dbff2a3e0233b6e07455125c09643a54808d14
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQAcebAAoJEFpvPKfnPDWzwwYH/RTUL5eOaju5gDpqj9mnIGvH
+3nEoxo++o1v+KHzxMNcqPwNtDDumTgkhRz04n1ZiHzT7rkP36HRXGPi/WXtH2Ouy
+i6fM7FNGTwiID/70NU0hGBbMrrZ0huHukkpulPk0ITezVlp9k+FNp1BxR+4npZe3
+E+dqw8xeSPvyTyLTrooDOxTjfPXqhC7cfEHi9lqK3NHSJIRnfkyHKiX8whxgvznA
+IvKXqIiI1K3rZB9LgoTs600PkDQX7cs2cM7jZuM3cId/8+apx8WnPjbzs8x+1CLu
+/tt9CWka5aOCAHMp7lkEX7TCqbFeeZ88M8xqUw61CbRUDaJ6SqI7mBuXh+3wAEU=
+=1D8K
+-----END PGP SIGNATURE-----
diff --git a/games-board/openyahtzee/files/openyahtzee-1.9.1-underlink.patch b/games-board/openyahtzee/files/openyahtzee-1.9.1-underlink.patch
deleted file mode 100644
index 9e49012d131a..000000000000
--- a/games-board/openyahtzee/files/openyahtzee-1.9.1-underlink.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/Makefile.am.old	2011-06-20 13:41:03.264848550 +0200
-+++ src/Makefile.am	2011-06-20 13:42:39.667245673 +0200
-@@ -42,4 +42,4 @@
- 	openyahtzee.rc
- 
- AM_CXXFLAGS = @WX_CXXFLAGS@
--openyahtzee_LDFLAGS = @WX_LIBS@
-+openyahtzee_LDADD = @WX_LIBS@ -ldl
diff --git a/games-board/openyahtzee/openyahtzee-1.9.1.ebuild b/games-board/openyahtzee/openyahtzee-1.9.1.ebuild
index 18f68a0418fd..366fc8fe4a99 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.1.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/openyahtzee-1.9.1.ebuild,v 1.1 2012/07/11 21:26:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/openyahtzee-1.9.1.ebuild,v 1.2 2012/07/14 19:29:04 hasufell Exp $
 
 EAPI=2
 WX_GTK_VER="2.8"
-inherit eutils autotools wxwidgets games
+inherit eutils wxwidgets toolchain-funcs versionator games
 
 DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee"
 HOMEPAGE="http://openyahtzee.sourceforge.net/"
@@ -15,11 +15,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="x11-libs/wxGTK:2.8[X]"
+DEPEND=">=sys-devel/gcc-4.6
+	x11-libs/wxGTK:2.8[X]"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlink.patch
-	eautoreconf
+pkg_setup() {
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+
+	games_pkg_setup
 }
 
 src_configure() {