version bump, happy easter

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 115 insertions, 2 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index bf04b3d439e5..e6c5cf76cb5c 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.141 2009/03/24 21:34:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.142 2009/04/13 01:58:54 mr_bones_ Exp $
+
+*wesnoth-1.6.1 (13 Apr 2009)
+
+  13 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/config.h.cmake, +wesnoth-1.6.1.ebuild:
+  version bump
 
   24 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.6a.ebuild:
   touchups; install desktop files (bug #263666)
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 7ad877cc92bb..b6eafee75781 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,8 +1,11 @@
+AUX config.h.cmake 292 RMD160 5b01d7d21b381b3c917adc761c3e7cd3afacf24c SHA1 3bf1e753f66daaefc62d7b04bc7083c043d1dcc6 SHA256 71367013684e644e99877cec207a088b859fdb1160a4a3ca5aafbf5d53721ed4
 AUX no-python.patch 770 RMD160 9fe2785748a54c54a05699ce6686bf3b9c25ab39 SHA1 dd025bf9a0c85c78dd128aa3b18dcdce34a93d4b SHA256 4e5254615565151cdd15a93c0a4aaa79a708cdf2d47eb39057f22f877db9e8ff
 AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad055ea943485c0a1cf324e39a340c89b00 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065
 DIST wesnoth-1.4.7.tar.bz2 155052245 RMD160 8a515aca790424a550505512eb42b101860e87b2 SHA1 f8eb17e7a7aaff5d8fff1e18a1479efcf932fd27 SHA256 63c85889ef8c08e6dd5ea977edd057d64ce65a4934e661e222d2b0dd89e26847
+DIST wesnoth-1.6.1.tar.bz2 228937525 RMD160 a7085221e1c4d09f2f057d4043b004382faf7568 SHA1 e84a5d9aae300d189f8d210fd58db5c708c20788 SHA256 ba606a0c636438603dbd19b910065865b2012ce2d6b6d35a09e5e0c18176dddf
 DIST wesnoth-1.6a.tar.bz2 225396333 RMD160 0cee144eb1454202245bd4db07ccc8011170d8d2 SHA1 9baef5dbba36c77b86382f1a1d8bb3826ef18cc8 SHA256 fed9c9da6d7780dc503958a48e6c356f9ced4a8a3e1530ccf9610238b532ae19
 EBUILD wesnoth-1.4.7-r1.ebuild 3233 RMD160 6b5166ea6e91d77f3f1a605808b8092631d85784 SHA1 661737fe591cf566b1b3249c6062e7445b919169 SHA256 b666aed774d4c980808739a8feb92940b13aedc56c450dca7d0df983866d052e
+EBUILD wesnoth-1.6.1.ebuild 2737 RMD160 c35a6dca5e725c8d566bd3ca2c7efcdbbf8c5b0c SHA1 c01f69c7cdf4145bf763a635f5d620e848f7fd9b SHA256 7bf908d50fd9a0e5de814b93f7aa3f73be370c888cadd7c06d4cc7dde98508c3
 EBUILD wesnoth-1.6a.ebuild 2550 RMD160 bcd24988dab00c6262bff8fccc518a5a793a1b97 SHA1 c481d0eea331ca85a5264a3863028f3be7cc6d66 SHA256 26386992e2f89e726650936bc365541719e1da715552fb5b00a36319b868df03
-MISC ChangeLog 18584 RMD160 3dbac27747c3b1575aa1c8b26cb2af801ea87a87 SHA1 62103ae743ae3198ff24d6a5fa09f03589ab1fe8 SHA256 8306764b741c58a9b64d6532b76192f1429138561e0aab5ef9755fb3c2714f7c
+MISC ChangeLog 18733 RMD160 ab5101ebd6ae13e7795eb7f6dc0eb13c0e1c2369 SHA1 f845c345c117ef6f7a93811f44a379caa5cb14f3 SHA256 d5c09d6691dd136581e48c764c9b33dec19bcabab11da17b3ad3b3ab28767e10
 MISC metadata.xml 612 RMD160 f14f4748e1c611b41864ee5e1bdaa9e56de55d4a SHA1 f77e1b84262e73a7ab77b13666e6e00a0cbe593c SHA256 0c38c6a5c0cd5fee19c6c57c52f50c4e383581af23098aabbe4bbf43c9f5f2f7
diff --git a/games-strategy/wesnoth/files/config.h.cmake b/games-strategy/wesnoth/files/config.h.cmake
new file mode 100644
index 000000000000..5bef010c4532
--- /dev/null
+++ b/games-strategy/wesnoth/files/config.h.cmake
@@ -0,0 +1,8 @@
+/*this file is used to automatically set some defines and is used in the CMake recipe*/
+#cmakedefine HAVE_STDLIB_H 1
+#cmakedefine HAVE_UNISTD_H 1
+#cmakedefine HAVE_POLL_H 1
+#cmakedefine HAVE_SYS_POLL_H 1
+#cmakedefine HAVE_SYS_SELECT_H 1
+#cmakedefine HAVE_SENDFILE 1
+#cmakedefine HAVE_ROUND 1
diff --git a/games-strategy/wesnoth/wesnoth-1.6.1.ebuild b/games-strategy/wesnoth/wesnoth-1.6.1.ebuild
new file mode 100644
index 000000000000..2cade3e72c89
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.6.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.6.1.ebuild,v 1.1 2009/04/13 01:58:54 mr_bones_ Exp $
+
+EAPI=2
+inherit cmake-utils eutils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org/"
+SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dedicated nls server tinygui"
+
+RDEPEND=">=media-libs/libsdl-1.2.7[X]
+	media-libs/sdl-net
+	>=media-libs/sdl-ttf-2.0.8
+	>=media-libs/sdl-mixer-1.2[vorbis]
+	>=media-libs/sdl-image-1.2[jpeg,png]
+	dev-libs/boost
+	sys-libs/zlib
+	x11-libs/pango
+	media-libs/fontconfig
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!dedicated? (
+		tinygui? ( media-gfx/imagemagick[jpeg,png] )
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	if use dedicated || use server ; then
+		sed \
+			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
+			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
+			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
+			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
+			> "${T}"/wesnothd \
+			|| die "sed failed"
+	fi
+	cp "${FILESDIR}"/config.h.cmake . || die "cp failed"
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+	if use dedicated || use server ; then
+		mycmakeargs="${mycmakeargs}
+			-DENABLE_CAMPAIGN_SERVER=TRUE
+			-DENABLE_SERVER=TRUE
+			-DSERVER_UID=${GAMES_USER_DED}
+			-DSERVER_GID=${GAMES_GROUP}
+			-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+	else
+		mycmakeargs="${mycmakeargs}
+			-DENABLE_CAMPAIGN_SERVER=FALSE
+			-DENABLE_SERVER=FALSE"
+	fi
+	mycmakeargs="
+		${mycmakeargs}
+		$(cmake-utils_use_enable !dedicated GAME)
+		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
+		$(cmake-utils_use_enable nls NLS)
+		-DGUI=$(use tinygui && echo tiny || echo normal)
+		-DENABLE_FRIBIDI=FALSE
+		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+		-DPREFERENCES_DIR=.wesnoth
+		-DDATAROOTDIR=${GAMES_DATADIR}
+		-DBINDIR=${GAMES_BINDIR}
+		-DICONDIR=/usr/share/pixmaps
+		-DDESKTOPDIR=/usr/share/applications
+		-DMANDIR=/usr/share/man
+		-DDOCDIR=/usr/share/doc/${PF}"
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="README changelog players_changelog" cmake-utils_src_install
+	if use dedicated || use server; then
+		keepdir "${GAMES_STATEDIR}/run/wesnothd"
+		doinitd "${T}"/wesnothd || die "doinitd failed"
+	fi
+	#doicon icons/{wesnoth-icon.png,wesnoth_editor-icon.png}
+	#domenu icons/*desktop
+	prepgamesdirs
+}