version bump (bug #380657)

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

8 files changed, 242 insertions, 14 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 8b405abed4e0..7c5d1e8167d7 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/allegro
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.109 2011/08/09 12:29:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.110 2011/09/03 08:57:09 mr_bones_ Exp $
+
+*allegro-5.0.4 (03 Sep 2011)
+*allegro-4.4.2 (03 Sep 2011)
+
+  03 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> +allegro-4.4.2.ebuild,
+  +files/allegro-4.4.2-rpath.patch, +files/allegro-4.4.2-shared.patch,
+  +files/allegro-4.4.2-underlink.patch, +allegro-5.0.4.ebuild,
+  +files/allegro-5.0.4-underlink.patch:
+  version bump (bug #380657)
 
   09 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> allegro-5.0.3.ebuild:
   ppc/ppc64 stable wrt #375491
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 89fe9ac55eca..85721e62ba2a 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,26 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX allegro-4.4.1.1-optional_drivers.patch 1500 RMD160 c3c261860fe46d62059cc4958d5019f493c6d27c SHA1 08c3dc9e9edf5fcd2834243c39d8296c5a9a0ee1 SHA256 b38d94cd954117b179bfb8e64001e7c687dc841314d525b99e5bd334a431c700
 AUX allegro-4.4.1.1-rpath.patch 178 RMD160 4f33620f559355fa38502d5ba6e0eb365f501326 SHA1 272322280645098a32b868e8c43cbfc5f916a650 SHA256 baab915e625d59950573ed053587226f28adc59a18bbe39a10a732cb906b2188
 AUX allegro-4.4.1.1-shared.patch 243 RMD160 88e5821d88b7e93091378af6766a91dc10daa727 SHA1 bc774db7b7e18b2d8611b205708eeb5c7a000752 SHA256 99c282c3c0377fafd613b81e3f3b13a817cabf1a7ab34219f1342a20c06c2d6d
 AUX allegro-4.4.1.1-underlink.patch 456 RMD160 bfe6422ed807fe87ef3282dcf30ccdb2dc741f31 SHA1 6efb7613810e1619a81b949cc65918000f852d67 SHA256 0bcaff3494611330f2448d3d81ab2bcb0072bff3a1672610bb4ca0edfd007ae3
+AUX allegro-4.4.2-rpath.patch 178 RMD160 4f33620f559355fa38502d5ba6e0eb365f501326 SHA1 272322280645098a32b868e8c43cbfc5f916a650 SHA256 baab915e625d59950573ed053587226f28adc59a18bbe39a10a732cb906b2188
+AUX allegro-4.4.2-shared.patch 243 RMD160 88e5821d88b7e93091378af6766a91dc10daa727 SHA1 bc774db7b7e18b2d8611b205708eeb5c7a000752 SHA256 99c282c3c0377fafd613b81e3f3b13a817cabf1a7ab34219f1342a20c06c2d6d
+AUX allegro-4.4.2-underlink.patch 456 RMD160 bfe6422ed807fe87ef3282dcf30ccdb2dc741f31 SHA1 6efb7613810e1619a81b949cc65918000f852d67 SHA256 0bcaff3494611330f2448d3d81ab2bcb0072bff3a1672610bb4ca0edfd007ae3
 AUX allegro-5.0.1-underlink.patch 390 RMD160 dd4514dfd4ba540b87115f97550b661573aec061 SHA1 050dd296cb040d7271c7db546a14fcf184aaeab9 SHA256 ea4d01bca76627303a81dab285278d7e2ce27079a0810407598070db090964fc
 AUX allegro-5.0.3-underlink.patch 390 RMD160 dd4514dfd4ba540b87115f97550b661573aec061 SHA1 050dd296cb040d7271c7db546a14fcf184aaeab9 SHA256 ea4d01bca76627303a81dab285278d7e2ce27079a0810407598070db090964fc
+AUX allegro-5.0.4-underlink.patch 390 RMD160 dd4514dfd4ba540b87115f97550b661573aec061 SHA1 050dd296cb040d7271c7db546a14fcf184aaeab9 SHA256 ea4d01bca76627303a81dab285278d7e2ce27079a0810407598070db090964fc
 DIST allegro-4.4.1.1.tar.gz 4625438 RMD160 9167893e6ad33301bc23daeccb4fb899f16470d3 SHA1 1970570b54c4329c7bd6d103db01624c68f2e9be SHA256 4e29884cba88b289da5b22da93e8760d68a197d093b23f61e994f3594760d782
+DIST allegro-4.4.2.tar.gz 4674902 RMD160 a6f6a03d6748230dfb5f306d1a05ef45ffa49f42 SHA1 ae0c15d2cb6b0337ef388dc98cefc620883720df SHA256 1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc
 DIST allegro-5.0.1.tar.gz 3016708 RMD160 39f46ab64a89725b10e87d7b351f47742a2688ab SHA1 bf7f3a0cf510b0d2a718c7d16ac0cb19e2d06aed SHA256 2c01bada75db4b1da43d7ce5ff4ffdbb0be963078f9747330516e0da24e0734e
 DIST allegro-5.0.3.tar.gz 3018367 RMD160 b4106df6aff86a9abd7833c79ea056e521ef1541 SHA1 0ac8383ca0d0aedeb7792810b50318f8d60247cb SHA256 011016c8aff478ff8e9f236215ec99ceedfddc7d2c22b50284f97415100d4844
+DIST allegro-5.0.4.tar.gz 3029888 RMD160 aad9510216266bde914d954d620effe5d95af5aa SHA1 141cfcf5d2bf04607ffd6b0064b6ba99dcb8e3ce SHA256 36b07a99027fa0251689d32fbc787c857683a260c450d2bfe099f0bdf11ca96e
 EBUILD allegro-4.4.1.1-r1.ebuild 2735 RMD160 7378c155b97e508223d8e30127aa0f88d6fa98a9 SHA1 80a88be269af2c9359c9afaa9efc40f1880b2d82 SHA256 cafdfebd0833463c1f254928bc536a5b68b3573de5894db23fa4adec4b82d9f6
+EBUILD allegro-4.4.2.ebuild 2689 RMD160 b773c3676da4cd0d251654511ae99efd35ef3f41 SHA1 7d834b801cea0b4be4fd487f53892f8c3104f2ce SHA256 863cf657222d312bd5031564f5dfe6492c22738ec00071cde289c11d531ffe6b
 EBUILD allegro-5.0.1.ebuild 2308 RMD160 002d4ce7b38b74300c3f840277c743ac81fdb5d7 SHA1 4e665b9a6192471f1349516816652a232ad2dfdd SHA256 574c9b4404efe0bf827a681692f5d4f89b1c5e96e89003c43d8ad8f29befde1e
 EBUILD allegro-5.0.3.ebuild 1994 RMD160 49830804012aafab8911cc7ba4e5177f518a1453 SHA1 de2aadf9ea42375fffa204e6f99f2b61e3d2ac4f SHA256 425e9402bdd57304e3ba498d45262a33db336b55692f878970f6b9f606ceae9b
-MISC ChangeLog 14336 RMD160 98a29e93e086c5622a63d90d1750d4b3f12370ca SHA1 3b619d08fb9f29f9cae027939f59079695eb86d5 SHA256 119f465243b888a4dc64bd77ff0cd442cb1b7158325770de7d988c7283f69cb9
+EBUILD allegro-5.0.4.ebuild 1997 RMD160 df05f24fea4c080806664f767c70650b9019511a SHA1 34fc4c559f50b5713ed048ac4cdda340da7ce61d SHA256 2b61d338d58da3b9636f4573174915965cdb025d75bea1094ca1e9dec95063f3
+MISC ChangeLog 14676 RMD160 3e3e8069f789e9f267defed6e597e73f50ee96ad SHA1 798da5f46290602659285a9b20e3e8e8cfa1502a SHA256 b232295d39816c86943f9bbedcaaa6f8c599ed9e96079f0db886140d86fa5177
 MISC metadata.xml 856 RMD160 a0cd388cc7fb773c0e20ec21d4989613f125f7fa SHA1 d45cced73383b0a1365eb3f407510454fb439635 SHA256 5a9ff2cd7ed67f377dd3ac080aaff9cefbef7c26ef04463467d31482c0dd5493
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQEIAAYFAk5BKEkACgkQIiMqcbOVdxTNgQP/VR7MM6KhdchwVouNLsU3M1JG
-G3U98TQOUb7dI+Jithwm/QsS5QOlr1jzXNHFVSiTBOzgHaBHjJNuy//2AY67dqFa
-8pG+Wsk23InokTZB5VSeN7iWlDZqFFX2wVUAfArDnpxWXSzkhVhXHg+xyPpWKWTF
-15gUtovAmyfMXor2Uxw=
-=t+2L
------END PGP SIGNATURE-----
diff --git a/media-libs/allegro/allegro-4.4.2.ebuild b/media-libs/allegro/allegro-4.4.2.ebuild
new file mode 100644
index 000000000000..d3f6a556c6c9
--- /dev/null
+++ b/media-libs/allegro/allegro-4.4.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.4.2.ebuild,v 1.1 2011/09/03 08:57:09 mr_bones_ Exp $
+
+EAPI=2
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake-utils eutils
+
+DESCRIPTION="cross-platform multimedia library"
+HOMEPAGE="http://alleg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
+
+LICENSE="Allegro as-is GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	png? ( >=media-libs/libpng-1.4 )
+	svga? ( media-libs/svgalib )
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+		opengl? ( virtual/opengl
+			virtual/glu )
+	)
+	!media-libs/allegrogl
+	!media-libs/jpgalleg"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	X? (
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-shared.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-rpath.patch
+
+	sed -i \
+		-e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
+		docs/CMakeLists.txt || die
+}
+
+src_configure() {
+	# WANT_LINUX_CONSOLE is by default OFF
+	# WANT_EXAMPLES doesn't install anything
+
+	mycmakeargs=(
+		"-DDOCDIR=share/doc"
+		"-DINFODIR=share/info"
+		"-DMANDIR=share/man"
+		$(cmake-utils_use_want alsa)
+		"-DWANT_EXAMPLES=OFF"
+		$(cmake-utils_use_want jack)
+		$(cmake-utils_use_want jpeg JPGALLEG)
+		"-DWANT_LINUX_CONSOLE=OFF"
+		$(cmake-utils_use_want fbcon LINUX_FBCON)
+		$(cmake-utils_use_want svga LINUX_SVGALIB)
+		$(cmake-utils_use_want vga LINUX_VGA)
+		$(cmake-utils_use_want png LOADPNG)
+		$(cmake-utils_use_want vorbis LOGG)
+		$(cmake-utils_use_want oss)
+		$(cmake-utils_use_want test TESTS)
+		$(cmake-utils_use_want X TOOLS)
+		$(cmake-utils_use_want X X11)
+		)
+
+	if use X; then
+		mycmakeargs+=(
+			$(cmake-utils_use_want opengl ALLEGROGL)
+			)
+	else
+		mycmakeargs+=(
+			"-DWANT_ALLEGROGL=OFF"
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dohtml docs/html/*.html || die
+	doman docs/man/*.3 || die
+
+	if use X; then
+		newbin setup/setup ${PN}-setup || die
+		insinto /usr/share/${PN}
+		doins {keyboard,language,setup/setup}.dat || die
+		newicon misc/icon.png ${PN}.png
+		make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
+	fi
+
+	rm -f "${D}"/usr/share/man/man3/init_dialog.3* #176020
+	newman docs/man/init_dialog.3 allegro_init_dialog.3
+}
diff --git a/media-libs/allegro/allegro-5.0.4.ebuild b/media-libs/allegro/allegro-5.0.4.ebuild
new file mode 100644
index 000000000000..801175b488aa
--- /dev/null
+++ b/media-libs/allegro/allegro-5.0.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.4.ebuild,v 1.1 2011/09/03 08:57:09 mr_bones_ Exp $
+
+EAPI=2
+inherit cmake-utils
+
+DESCRIPTION="A game programming library"
+HOMEPAGE="http://alleg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
+
+LICENSE="BSD ZLIB"
+SLOT="5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	dumb? ( media-libs/dumb )
+	flac? ( media-libs/flac )
+	jpeg? ( virtual/jpeg )
+	openal? ( media-libs/openal )
+	physfs? ( dev-games/physfs )
+	png? ( >=media-libs/libpng-1.4 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	truetype? ( >=media-libs/freetype-2 )
+	vorbis? ( media-libs/libvorbis )
+	x11-libs/libXcursor
+	x11-libs/libXxf86vm
+	x11-libs/libXrandr
+	x11-libs/libX11
+	gtk? ( x11-libs/gtk+:2 )
+	virtual/opengl
+	xinerama? ( x11-libs/libXinerama )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto"
+
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_want alsa)
+		-DWANT_DEMO=OFF
+		-DWANT_EXAMPLES=OFF
+		$(cmake-utils_use_want flac)
+		$(cmake-utils_use_want jpeg IMAGE_JPG)
+		$(cmake-utils_use_want png IMAGE_PNG)
+		$(cmake-utils_use_want dumb MODAUDIO)
+		$(cmake-utils_use_want openal)
+		$(cmake-utils_use_want oss)
+		$(cmake-utils_use_want physfs)
+		$(cmake-utils_use_want pulseaudio)
+		$(cmake-utils_use_want test TESTS)
+		$(cmake-utils_use_want truetype TTF)
+		$(cmake-utils_use_want vorbis)
+		$(cmake-utils_use_want gtk NATIVE_DIALOG)
+		$(cmake-utils_use_want X opengl)
+		$(cmake-utils_use_want xinerama X11_XINERAMA)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc CHANGES-5.0.txt || die
+	dohtml -r docs/html/refman/* || die
+	doman docs/man/*.3 || die
+}
diff --git a/media-libs/allegro/files/allegro-4.4.2-rpath.patch b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
new file mode 100644
index 000000000000..57bdb6bf8d0e
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
@@ -0,0 +1,8 @@
+--- setup/CMakeLists.txt
++++ setup/CMakeLists.txt
+@@ -1,3 +1,5 @@
++set(CMAKE_SKIP_BUILD_RPATH TRUE)
++
+ add_our_executable(setup setup.c)
+ copy_files(copy_setup_data setup.dat)
+ 
diff --git a/media-libs/allegro/files/allegro-4.4.2-shared.patch b/media-libs/allegro/files/allegro-4.4.2-shared.patch
new file mode 100644
index 000000000000..665c03e31204
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-shared.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -830,7 +830,7 @@
+ option(WANT_LOGG "Enable logg" on)
+ option(WANT_JPGALLEG "Enable JPGAlleg" on)
+ 
+-if(WANT_FRAMEWORKS)
++if(SHARED)
+     set(ADDON_LINKAGE SHARED)
+ else()
+     set(ADDON_LINKAGE STATIC)
diff --git a/media-libs/allegro/files/allegro-4.4.2-underlink.patch b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
new file mode 100644
index 000000000000..33dc9d260b2d
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.old	2011-06-06 23:46:06.057320691 +0200
++++ CMakeLists.txt	2011-06-06 23:46:21.900313261 +0200
+@@ -392,7 +392,7 @@
+         message(FATAL_ERROR "Unix port requires pthreads support.")
+     endif()
+     set(ALLEGRO_HAVE_LIBPTHREAD 1)
+-    list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT})
++    list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT})
+     list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_UNIX_FILES})
+ 
+     if(WANT_OSS)
diff --git a/media-libs/allegro/files/allegro-5.0.4-underlink.patch b/media-libs/allegro/files/allegro-5.0.4-underlink.patch
new file mode 100644
index 000000000000..7702c1d2c6db
--- /dev/null
+++ b/media-libs/allegro/files/allegro-5.0.4-underlink.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.old	2011-06-06 23:56:09.367125536 +0200
++++ CMakeLists.txt	2011-06-06 23:56:19.311748807 +0200
+@@ -703,7 +703,7 @@
+ 
+ if(ALLEGRO_UNIX) # not MACOSX
+     list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_UNIX_FILES})
+-    list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT})
++    list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT})
+ endif(ALLEGRO_UNIX)
+ 
+ if(SUPPORT_X11)