Version bump to 2.3.6.

Adding required_use. Bug #425696

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

4 files changed, 151 insertions, 16 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index a38a11c511d7..1b24ea55e9e6 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.56 2012/08/03 12:47:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.57 2012/09/25 11:44:48 tupone Exp $
+
+*clanlib-2.3.6 (25 Sep 2012)
+
+  25 Sep 2012; Tupone Alfredo <tupone@gentoo.org> +clanlib-2.3.6.ebuild,
+  +files/clanlib-2.3.6-autotools.patch:
+  Version bump to 2.3.6.
+  Adding required_use. Bug #425696 by Diego
 
   03 Aug 2012; Markos Chandras <hwoarang@gentoo.org> clanlib-2.3.4.ebuild:
   Stable on amd64 wrt bug #418677
@@ -24,7 +31,7 @@
 
   06 Feb 2012; Tupone Alfredo <tupone@gentoo.org> +clanlib-2.3.4.ebuild,
   +files/clanlib-2.3.4-autotools.patch:
-  Version bump to 2.4.3 Bug #288218 by proDOOMman
+  Version bump to 2.3.4 Bug #288218 by proDOOMman
 
   15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> clanlib-0.8.1.ebuild,
   +files/clanlib-0.8.1-libpng15.patch:
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index dd4ed659bf10..75b23278fd1a 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -6,26 +6,19 @@ AUX clanlib-0.8.1-gcc44.patch 1523 SHA256 e6b8dc302fc3587fae86d1ecf4ac5fbaf2a056
 AUX clanlib-0.8.1-libpng15.patch 377 SHA256 6e6a878d16292255cff4f64605db6478ac855f079505434ca9a2f61aadb88342 SHA512 735fd6cadbd1c76ff38a229361c82c1208ea8ba8db60bd8bff082424244da9e88f1c74d8067991516866887d6240846c551a24a7f392a12ae3a2d6ce50e8644f WHIRLPOOL e35e13c89f90583fd4878b149fd9d6e8ad50131e11f94672171779f397fc020c58e5465a61774dedf467b02916acf113a5af28fddb502ae7f5f815df45474fa4
 AUX clanlib-0.8.1-ndebug.patch 866 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419 WHIRLPOOL 05e452b4d264619eaa8e30e5449389974a6d75e8d064931ad40e308a94203e0858813234be8a1e44b3c6279c25a95d3f6592a4f6b753e3255329d858a2a4e0df
 AUX clanlib-2.3.4-autotools.patch 1666 SHA256 9145d0f24058673541679547f133c3581cf2c8c4a49e1094304757aaedbfc51f SHA512 10fbe486160b8beedb469b38423fe9dc2f9478705e37ac2631b61fd3c8344cc6658ef61aabc31081af1b362a6ac638adbe84c65fd8810d5598258c9bb268fd31 WHIRLPOOL b25fe181ac2a3ca2b582266589d84010ce6c8daf8d98b1f17c530bddcc38ca4edafa37c0b341d6f9e4f6e0834adcf736e997946ae240f3d5b2354d0e8dbb1aa8
+AUX clanlib-2.3.6-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
 DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
 DIST ClanLib-2.3.4.tgz 25527668 SHA256 d3d2d2f32935bb382fb15f5008100e36182261c13561917e3aba11e271d5f1c3 SHA512 03c1fffc3f5bd3cb19c23f902507fdc0897a02c35fc9d02afa0a7e7547b7a2e3e6bb8634ee52eefb054c0e1aa3b50a77f877226a568ace35326cb9c45abcda12 WHIRLPOOL 06453b7d69352d2cd5672e788d5654dfc6458488f2039ddc0d601318c994dcd4312ff80bd1ef0645ee371b42a99c825382886a2b7d47275371b3587c6c64edce
+DIST ClanLib-2.3.6.tgz 25605576 SHA256 b8dc9b41028bf16c0a6082aa15cdee5d8b1ecd5256797576970f09a63e3fafde SHA512 572b51984f960a93dd03ad9f48a9f81a7c21c471616fe376c4b54e6cb0855b1043e35486c3eacdc8beadb30e48290a5a2da0cb287ec9aaf5f409f299861ab72c WHIRLPOOL 4389c13bbc71a61adb0330f0edea2be474071b721a90a920872f0d1c6d00ad4e1fcd2b8510144ffacb4f5ff5235ee702d64f9f56b338b449b3f908686ee70c26
 EBUILD clanlib-0.8.1.ebuild 2247 SHA256 39cd085e33d858ec50e0125a42a724072fadb9c8232d4d71a6efae6ec818d059 SHA512 b10575ae9c215acddb6cbaba6a0192cbb5ed2635b3729e275c4fe0014331b7073d5da8fad7e602ae298ef0ce863c832b5d3fa51f1ca6345b256151d8d929dea0 WHIRLPOOL d2ed20726b09a606fb6cda130018245dfef38d94d02c0591dd28ad6182168e0307cb1c8535473ccf237efb3ae21026584faac9c270c21c3635ade3b87a236855
 EBUILD clanlib-2.3.4.ebuild 2162 SHA256 4839a10e7348bebd9b0ba38633269d90a09a60e76cb75720f6cc26cbcdac26b6 SHA512 4b2aff3455fe4227a2d08ddd7db1e7e5b2f9ec55629bafff0b10dcc6f060daa2ee189a7c536e7b6e9b25bc9aa5618f7a535892523984aadbe4a82496fb9caea8 WHIRLPOOL b1be46ae77220a45ff993cc702f2f2fc851fefcebbad7b0bca7b510e1445752af55d3e52a8d3901af265489e71a5ff49743da34b0e617a60b63c2af91bfc9958
-MISC ChangeLog 10748 SHA256 291dedd1596f111d5636bed1181108c9955a211528564490598494806ad0cc58 SHA512 446b64af53f746e70c0a3ae34a98172ac3f3458e988f1bfde5c3115ba98b50df1466c666eaf178d980ee0618a10d7ef1028fd31916468297e1dd801b3555518f WHIRLPOOL 04f62c19c601a1ee28801651caca1406e6aa22c69c23c314f1465cd3fba0bcd24e0415714fd06030929c7eccff497bbf6941fa51b5984b1c620d67ac35ddf029
+EBUILD clanlib-2.3.6.ebuild 2074 SHA256 e30c7bd46f3ad20696832eb0bc4f92b5fc3c2ed5225992e5dc31233ec7812d28 SHA512 471e66019943ae4f892e87b608d546bce8fb3bf6b0f884adaff0c545a7dab9d8d38b0252f4be0ca61ab4f14310ccebc633d89b7d12f7c9c6457c02c55270763c WHIRLPOOL 08473f766022c6bf22e4e86b11408327a602e773da5d75ef443de9b89c18f9e3859681068fa05638434e9c139a9e764864ed22714cd78c059fba51c9bd2b9b43
+MISC ChangeLog 10959 SHA256 6e79f6081f9f1cb9fdd0c0df35f084515653b84c87cd8ef3b0e34dc076c7abb2 SHA512 f9a0402e795b0328edd64580cdee0d5920ec9869fa2a56f3896eea32af5513b6f28352e994f767923e789244760681635b5b34c3f5869b364777b918998d4816 WHIRLPOOL eccda42ebdd96ba0493fac72fb62f7bda1b39f34a05b23bb92dddecce32b3d2b99cdfb6f8959ea5eb6dd29cd85c8408a51c2f83f2e212c0a4d594973106e0379
 MISC metadata.xml 2920 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec SHA512 4795475271093f9a5537d6b485c3b2fc6b29291a57e48e7efb73e39ba94825216cb80e17c8e4f545accecc3af930161fc18a1e5c34c20901480723f7f5c0def3 WHIRLPOOL 0670b35d690693f9329de60396b7697ba12d16ba2118cfce397d97f36b2e7595d965f4d48afaf9c44332a197dec8bac81946763d1251ce6272362c6c65536d1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQG8hwAAoJEPqDWhW0r/LCZwUP/R0h9fpqygtk5DJPUu9yD4kK
-l8Wdrz6QCCWrAs4au4/hgGMH5C9g/61IEMVeVVy7qcDQX8aykzai1+WAraU5kfwW
-OFwOZY1GJRTLsteoXIhXgHG8s8yIpzuVkw0g2symD2ovqUZuKpj/+KRU3oYjlXMQ
-T0MKrLrciGDhGr0aYp2dt0Ky9mFWQmBXuUiWgTppOyyd6MZ/b9lFDJqsK6UomvIc
-YofaNlzc+CqPy7LyusiA5RCMXnil5xvmlRVojzVp3Zz9BD9UryCurz01qIFVRM3D
-V+QakLchXKL9TD9Z4RC+Ss2yf33qzozjDs6f7e54w24HzGu2GWop5hsG/FwZ2Nbp
-IXPcCvN5WkcdVcwslonl+rYnedR3zEYheYU0BrjO/XlTw/MwKtS4iSWrRcuWjL2H
-ZKFNuaZrBwx8h5r2rFsAgZdHfIAYwQQT1+elHZuUqVNY5txVpRQdIVfxAusGUb4d
-IC7AGU5JOk7LNR5lft8jFV0NkEEy93YeuQsrT1FC6W3Z/HnQFRMZPYjISbq/rmAy
-caOV6a8Pfu3MawWy0UMJFT6rhSn8QkOoLL6p6tSrfEWHKX4x2JRqIg+nxtUpthHV
-Wmi7LxRzd0kb7HUNNQoRWqE8qYao3dN9jUUZwL6D/8hearIA4wLXjyfGLpzzifKo
-tZBEpmyGr+i2rfxNTPOc
-=ANoD
+iEYEAREIAAYFAlBhmT8ACgkQIY77eQFFFC0OYACgr25bEw3hmhEXX0PD1EKnoRKG
++2oAoM/rh0ozSbDk6MBUakafVxQ9ytGo
+=gPS/
 -----END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-2.3.6.ebuild b/dev-games/clanlib/clanlib-2.3.6.ebuild
new file mode 100644
index 000000000000..5242b0a2fd68
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.1 2012/09/25 11:44:48 tupone Exp $
+
+EAPI=4
+inherit flag-o-matic eutils autotools-utils
+
+MY_P=ClanLib-${PV}
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="doc ipv6 mikmod opengl sound sqlite sse2 static-libs vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="sys-libs/zlib
+	X? (
+		media-libs/libpng
+		virtual/jpeg
+		media-libs/freetype
+		media-libs/fontconfig
+		opengl? ( virtual/opengl )
+		app-arch/bzip2
+		x11-libs/libX11
+	)
+	sqlite? ( dev-db/sqlite )
+	sound? ( media-libs/alsa-lib )
+	mikmod? (
+		media-libs/libmikmod
+		media-libs/alsa-lib
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/alsa-lib
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen dev-lang/perl )"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(
+	CODING_STYLE
+	CREDITS
+	PATCHES
+	README
+)
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanGL1)
+		$(use_enable opengl clanGUI)
+		$(use_enable X clanDisplay)
+		$(use_enable vorbis clanVorbis)
+		$(use_enable mikmod clanMikMod)
+		$(use_enable sqlite clanSqlite)
+		$(use_enable ipv6 getaddr)
+	)
+	use sound \
+		|| use vorbis \
+		|| use mikmod \
+		|| myeconfargs+=( --disable-clanSound )
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+	autotools-utils_src_install
+	if use doc ; then
+		emake DESTDIR="${D}" install-html
+		dodoc -r Examples Resources
+	fi
+}
diff --git a/dev-games/clanlib/files/clanlib-2.3.6-autotools.patch b/dev-games/clanlib/files/clanlib-2.3.6-autotools.patch
new file mode 100644
index 000000000000..97db79ac4245
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.6-autotools.patch
@@ -0,0 +1,45 @@
+--- Documentation/Reference/Makefile.am.old	2012-09-25 10:39:25.973544935 +0200
++++ Documentation/Reference/Makefile.am	2012-09-25 10:39:42.560554053 +0200
+@@ -10,7 +10,7 @@
+ 	mkdir doxyoutput;
+ 	mkdir reftest
+ 	doxygen ./clanlib.doxygen
+-	make -C ../Utilities/ReferenceDocs
++	$(MAKE) -C ../Utilities/ReferenceDocs
+ 	../Utilities/ReferenceDocs/ReferenceDocs
+ 
+ install-html:
+--- configure.ac.old	2012-09-25 11:07:38.412537590 +0200
++++ configure.ac	2012-09-25 11:09:41.133939131 +0200
+@@ -337,11 +337,9 @@
+ 
+ 	dnl  Optional linux/joystick.h
+ 	AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)
+-	AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
+ 
+ 	dnl Optional linux/input.h
+ 	AC_CHECK_HEADERS(linux/input.h, linux_input=yes)
+-	AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ 	if test "$WIN32" = "no" && test "$enable_clanDisplay" != "no"; then
+ 	CLANLIB_CHECK_LIB(fontconfig,  [`cat $srcdir/Setup/Tests/fontconfig.cpp`],  clanDisplay, [ *** Cannot find fontconfig (See http://fontconfig.org/ ) (Try libfontconfig1-dev or better) ], [-lfontconfig])
+@@ -358,6 +356,8 @@
+ 			clanDisplay, [ *** Cannot find version 8 of DirectInput], [-ldxguid -lole32 -ldinput8])
+ 	fi
+ fi
++AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
++AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ have_xrender=no
+ 
+@@ -515,9 +515,9 @@
+ 	fi
+ 
+ 	if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
+-	AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ fi
++AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ if test "$enable_clanSound" != "no"; then
+ 	enable_clanSound=yes