Fix underlink. Bug #367673

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

6 files changed, 48 insertions, 6 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 1cf2b23d0663..3c2a8c178b2e 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,11 @@
 # 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.102 2011/04/02 11:52:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.103 2011/06/06 22:10:05 tupone Exp $
+
+  06 Jun 2011; Tupone Alfredo <tupone@gentoo.org> allegro-4.4.1.1-r1.ebuild,
+  +files/allegro-4.4.1.1-underlink.patch, allegro-5.0.1.ebuild,
+  +files/allegro-5.0.1-underlink.patch:
+  Fix underlink. Bug #367673 by Diego Elio Pettenò
 
   02 Apr 2011; Raúl Porcel <armin76@gentoo.org> allegro-4.4.1.1-r1.ebuild:
   Drop ia64 keywords
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index d49489d586b8..c4e10bd67d2d 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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-5.0.1-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-5.0.1.tar.gz 3016708 RMD160 39f46ab64a89725b10e87d7b351f47742a2688ab SHA1 bf7f3a0cf510b0d2a718c7d16ac0cb19e2d06aed SHA256 2c01bada75db4b1da43d7ce5ff4ffdbb0be963078f9747330516e0da24e0734e
-EBUILD allegro-4.4.1.1-r1.ebuild 2708 RMD160 e174cd71f4a441784bea7705655197e010f10d5d SHA1 58f4f39402099825dd4367f4148db40fdfa6be4e SHA256 4e113a48da27cfa56b7ead377058abe687e8acde83564b30c56be0ffecae43cd
-EBUILD allegro-5.0.1.ebuild 2277 RMD160 d8e9bf2254ebf86b2c58e50cb660942c957bb7ae SHA1 709600955556dfa1f8969c91431a5723316b3539 SHA256 556104feb20f1a89acc43575a193fb62317464e4487199afadbfb208d96bbf17
-MISC ChangeLog 13297 RMD160 42f413642f7dc06d98898a2f5dc612bd54f2f764 SHA1 303bc3721eb44235587f6c86b958f223393589f7 SHA256 3cfe085f818681c9be6d7c6fa3f2bac036c40859f56d708aefee1ad65552418f
+EBUILD allegro-4.4.1.1-r1.ebuild 2746 RMD160 fb7f6262e233773d0154fa88bce6bf460bbdb215 SHA1 358bd433e2ce60c93050fa3ce975ad386ae2d17b SHA256 fb56e18eced61229eb2fdd4d5246792d02d01c7e8738e8c1ef8d3163b4f99ba4
+EBUILD allegro-5.0.1.ebuild 2321 RMD160 51502df725708947ebd5cb3a50c03b4c2b93a0f3 SHA1 a2caa2b515e1b558e903e7899ca84a5a9bdc5909 SHA256 37fcec677e2ca239917c63c3dfc0bfddd6b62f67bd04aa9da7340fa7953df3c6
+MISC ChangeLog 13530 RMD160 47da4ad799337916d6a2118da303c5078066227e SHA1 13e0e418ad77fec4154434fdecaf1b055eb30e85 SHA256 c60c263a6d41ae9b11095b25d9f364533a5e817517dfb65e67a36df6aa7c08d4
 MISC metadata.xml 856 RMD160 a0cd388cc7fb773c0e20ec21d4989613f125f7fa SHA1 d45cced73383b0a1365eb3f407510454fb439635 SHA256 5a9ff2cd7ed67f377dd3ac080aaff9cefbef7c26ef04463467d31482c0dd5493
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3tUEgACgkQIY77eQFFFC3+YQCfSl1yWKgA16gpfc1TOcNX01qI
+JV8AoOrQ1pqxCZKktvflUob1gh3/XCvJ
+=WToP
+-----END PGP SIGNATURE-----
diff --git a/media-libs/allegro/allegro-4.4.1.1-r1.ebuild b/media-libs/allegro/allegro-4.4.1.1-r1.ebuild
index 3929c9c1248c..6e7d296c297f 100644
--- a/media-libs/allegro/allegro-4.4.1.1-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1-r1.ebuild,v 1.11 2011/04/02 11:52:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.4.1.1-r1.ebuild,v 1.12 2011/06/06 22:10:05 tupone Exp $
 
 EAPI=2
 CMAKE_IN_SOURCE_BUILD=1
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-shared.patch \
 		"${FILESDIR}"/${P}-optional_drivers.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
 		"${FILESDIR}"/${P}-rpath.patch
 
 	sed -i \
diff --git a/media-libs/allegro/allegro-5.0.1.ebuild b/media-libs/allegro/allegro-5.0.1.ebuild
index ff6e93614574..f63eee9d66b0 100644
--- a/media-libs/allegro/allegro-5.0.1.ebuild
+++ b/media-libs/allegro/allegro-5.0.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.4 2011/04/02 11:37:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.1.ebuild,v 1.5 2011/06/06 22:10:05 tupone Exp $
 
 EAPI=2
 inherit cmake-utils
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 		x11-proto/xproto
 	)"
 
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_want alsa)
diff --git a/media-libs/allegro/files/allegro-4.4.1.1-underlink.patch b/media-libs/allegro/files/allegro-4.4.1.1-underlink.patch
new file mode 100644
index 000000000000..33dc9d260b2d
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.1.1-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.1-underlink.patch b/media-libs/allegro/files/allegro-5.0.1-underlink.patch
new file mode 100644
index 000000000000..7702c1d2c6db
--- /dev/null
+++ b/media-libs/allegro/files/allegro-5.0.1-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)