fix underlinking wrt #520672

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 50 insertions, 15 deletions

diff --git a/dev-games/aseprite/ChangeLog b/dev-games/aseprite/ChangeLog
index 9930a6cf0c47..b14b6c3253fc 100644
--- a/dev-games/aseprite/ChangeLog
+++ b/dev-games/aseprite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/aseprite
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/ChangeLog,v 1.5 2013/08/10 15:00:11 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/ChangeLog,v 1.6 2014/11/07 00:58:13 hasufell Exp $
+
+  07 Nov 2014; Julian Ospald <hasufell@gentoo.org> aseprite-0.9.5-r1.ebuild,
+  +files/aseprite-0.9.5-underlinking.patch:
+  fix underlinking wrt #520672
 
 *aseprite-0.9.5-r1 (10 Aug 2013)
 
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 2743f3af63f9..944025754ca9 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -2,20 +2,29 @@
 Hash: SHA256
 
 AUX aseprite-0.9.5-as-needed.patch 1119 SHA256 cee86f85a9baffa6f85cd22c096f14271dc6b2f8589e8958d0a93128e7c013c2 SHA512 d8b986cb5dc6f4737453680abee7c2a150aed40df13c807b7b5d1140e3bca7e854ce3c62189d12647933408c2e49e4a85bb3259b1a5964dc93b50e16202547e7 WHIRLPOOL 7b2bbb80c86eb45a202396f5f8f83760eccc3d3a42e47688f8f4c67cf0ee82f8cc7dc665a76fa3bc0bd9a74fadd14af5afc9b1747e258ab61a5a895f6f12a8a1
+AUX aseprite-0.9.5-underlinking.patch 714 SHA256 b4bde90abac92a6c0cd9533610a1623497bb6ff371b7574f38b0d55dcd7e25ff SHA512 d941006981c01a93da30f7460fb5d4d9cd9927f370c568d3c8a39a4b6eaff1998f054bc96fc546f62b58d61eac7994210b45b56f3ad2f65cacf7c4cb333205f8 WHIRLPOOL 9661b86c2341f505f158409751759468a7757a14ba5edb39904cf35607a3bbb588bbcd8f5687afa9b696651f4299706a1c1d6a23c268cf88efcc048c6a1084d3
 DIST aseprite-0.9.5.tar.xz 507744 SHA256 81e0360d9d8a32d6c548775dbacdb1520aac94b54c2d9f1327d52f219737f154 SHA512 fc6df942aefea67fd05e1b688209b70a2d5879a1441f61a6e3ee4d72fcdab4e580e1d4d7392fd493e0a46c45401a3eef759aa3efee17450e4c98df7f310b2d00 WHIRLPOOL 060dcf2754827ab3b30dde55cfcecd25e2d88f6e296b45529737e2194f4a9891d171776d10f9c571890efb9766b64080b85dc3d737102d2ac7be9843d27fdaef
-EBUILD aseprite-0.9.5-r1.ebuild 2678 SHA256 5949d4e373f883da1f13063bb6f2b859b576b633d09aa6ba82044a83a60c6756 SHA512 d3cc5d7de4c7d3c731e2cec933ee6334c0de0481047026f6c801334052b08393fdbac4b2e1335a704f83a77d374551f877c05ca90773ed032084dc28b78f611f WHIRLPOOL fec9b704f0e0c8f96f6a60305a4c75ee743be6047b0e9afc0f9dd6c87b41570f9be2ce1f824fc05b03a7c38e7c057df590090dc49fdbfa46758645dfcc8382f2
+EBUILD aseprite-0.9.5-r1.ebuild 2731 SHA256 720154fa0d8cc06894adbbe8a0dcd1e8018eba32d187c88fbaf3fa473d9a8efe SHA512 1af14f0d147d7e0f6e479c1a617b2bc30c7655a278ee23855ed1bceca749627406e5daac6f7452331219f5bea55a34b64e49301bfc3deb8549f29cf867d7f715 WHIRLPOOL b53a3c1ec80edd92a66703fa399a6e1260f1fb97c822ab30535812ab1e3aa7f11c2a908764a0c62186b1c55f0748a99071dd873801a2786f78ee84021fc176cd
 EBUILD aseprite-0.9.5.ebuild 2476 SHA256 ee3901cc30f39c7e47b0ef56c3cd4afc1520901d64a2b0176e9d2eb0ee9adde4 SHA512 b69864e4d12278494f65616b067678d7a9e524bab50c1a0ad52147ea88dddcaa3f0820a20a200f6031b2308dd800de2cffa57f37228cea82c4ce679e0249896e WHIRLPOOL 192a10f50c62bebcfb6f3b66336ded1d4632bbe40a4e6034e9af807f01b6aeb408c60d56fe9e56664c49ca5a88afdd4c7a3763d4f57b478320d0782fcba566d0
 EBUILD aseprite-9999.ebuild 2394 SHA256 9eda764e284111930b6c5e5262dbd1ba948e5f3a2d36b32c973ba9e089e3c099 SHA512 015fb5fe84739878e7958257044536580d664470cddebee0a86158d59e35240d670a519d578c3af7a5e187ba08f8109460f7d465bface45575acba3848a261a2 WHIRLPOOL cd820e49ee57e6babcc2d17ff73f1700653e0a144a6a11b991f7a781a28d3b527ef6b821ffd056ce01f5e2eeee9ed7a8704a05f6d9a9cc32819a98169bd9f75d
-MISC ChangeLog 1406 SHA256 7da5f1c2625e38e5a17134e1468b3508df75ab2b76ff44e323110a293c9fbce1 SHA512 b7bf168552e4e7fd82a30385307a4093c6c31888a3037a9a87cca5e67085724ce36aa0f78b790587856b37c0b843690fcfea82f15b6df2687ca51c03c927887d WHIRLPOOL a09e416565c677695da3639c22d81bafeecc279151c69b99883653493fd3727ae029afb65fd7900838051c4075154d90a647c5e9b3a2e0fb147fbe088a14a172
+MISC ChangeLog 1561 SHA256 4f34d6e4455d302445806af765c73455536fce6f5a1303b8d04c877b29fae814 SHA512 f9def178c09b06bf920532f10cc850e70b79a7362a17ed1b9cb5fd8f6a7b375cdb1caddd528f80e2ab0e00f7de72091ae5ffa2e56c2529cf4a0e7d0a7c74b3c9 WHIRLPOOL e2a2d583022b309bd08e7c3b85805f282829c708934eabe257b380e76095a926a17ad92e2852cda48e09e98a22a0974ad5212d0219f66a173d64d4de6ecd46a7
 MISC metadata.xml 504 SHA256 7357a7f89e6b651c245acf452decdce035c06a4ecd0a83a102bf3130c0598a48 SHA512 ec2e86e1f008445391a086e50aac0c5c96c36c5f885cae8a5011fd229710847d55c09f5f34aa1abb806f3ec134a4ae8f751d27b6f714cd49f1ea81c4df5997f3 WHIRLPOOL 70e07be609be829c5a09dfb3010461c6fc03e815dcbafb1adfcb90ce67f8cf3c81f777109cbabf99dd6c6234256e3f2641cd8d4f0a52883d419af23682df5386
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSBlSiAAoJEJWyH81tNOV91EoIAL85jmOibBx76BcGxtKGhsDB
-q5idzlUA5jVdaB+QSziEeyGjux3IVl5oWpacS8kk2SjgnbhXirzlPxvBC1IxpHtr
-LI8Cg9SKs9CDLHRMvrkDmHUd0Li/jfTxA17qU+m4b7AJldw0/Ljaga7UwXYC7LZ1
-Oycy6JXhXrpSiNaId6M6oAMZg9vfKdio5wBHsctQUOBMtjLGlHn9FmZCCWr50vFw
-+CVukY19wPxQb9qbcMqBSCff38g17UvRTtGQo/8gLCnqIvHu7sv3yR8mERckzl09
-K9xjecsIgTMSGisqzh4YnHJdxAGajIKwzM+xqMv66DvuV0/Bb/vp88BW2bcFdjo=
-=fi7N
+iQJ8BAEBCABmBQJUXBkoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgZmoP/34VTnClxoEpxBkEuVW2U2Ng
+qnO//cSqYlIU87p8cvai47M8aZ/eDAv6I3Xk794ZHTO/CcfHaVYKWUhb6cg6y/cq
+3gKxojF5SGKBS+QrLsXUxsMKUx9zFia9J0IjhpCR+9Z+lYIphc20uC4cC3KCS3mY
+S9m6X8UmAWFpEkrJANoirKBPw3+l+N5TPOCRuv3lI1tgx7AocHiuptIbNZbAuKs5
+DXPiq9R9uF0Oz6xRBO2QOOt5ba641HNOGEJ/x/yeabyWTgVqSUxVV4iWQ63Fi0yk
+hSV+N9C6DEopu0BTwA4NkBXq3vA8FOiOMH5TMuqZEmMeOlLaa+dlThg+c/pCRKYR
+j6zqJETPmKzNzX0VOOvPARdKVzwICJ+S+T5fLa8SPov5NxJWYmAUvUxmQrII3DtV
+DrBKu4lTVUoVAUyi5Z0hJ7IfpbDkGWpRUN3IIb2/FGpLC5dQGXGbivVrQmjqpyOl
+MHM1r72g/09BIK0AMaSdSPE7n0oekT3PQf7U78iD3nRmpPynpgWvvoUsFqgNiJrz
+Ea6NbIjwzCYZyyksZH8nq72cl6I0Fmxsfgesdc2MWgm0OoypZ27V2RmhDY0CUpOF
+pBEC1QNNd7KttAW9RaglAUPXCKXDg9c9ClVSlFVSHKEET6+Y38MfP5rh+z163aev
+kxXaT2t0+c/j+inDOu23
+=NpBs
 -----END PGP SIGNATURE-----
diff --git a/dev-games/aseprite/aseprite-0.9.5-r1.ebuild b/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
index c3f453d81cce..fc7e80acba55 100644
--- a/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
+++ b/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-0.9.5-r1.ebuild,v 1.1 2013/08/10 15:00:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-0.9.5-r1.ebuild,v 1.2 2014/11/07 00:58:13 hasufell Exp $
 
 EAPI="5"
 
@@ -27,7 +27,8 @@ RDEPEND="dev-libs/tinyxml
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
 
-PATCHES=( "${FILESDIR}"/aseprite-0.9.5-as-needed.patch )
+PATCHES=( "${FILESDIR}"/aseprite-0.9.5-as-needed.patch
+			"${FILESDIR}"/aseprite-0.9.5-underlinking.patch )
 
 DOCS=( docs/quickref.odt
 	docs/files/ase.txt
diff --git a/dev-games/aseprite/files/aseprite-0.9.5-underlinking.patch b/dev-games/aseprite/files/aseprite-0.9.5-underlinking.patch
new file mode 100644
index 000000000000..8f3027d4baf7
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-0.9.5-underlinking.patch
@@ -0,0 +1,21 @@
+From 169edeaa69cce2670213c39232a249a487670883 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Sun, 2 Nov 2014 16:58:33 +0100
+Subject: [PATCH] Fix underlinking with USE_SHARED_ALLEGRO4=ON
+
+---
+ src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 21c3352..0ce11d2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -58,6 +58,7 @@ if(USE_SHARED_ALLEGRO4)
+     OUTPUT_VARIABLE LIBALLEGRO4_LINK_FLAGS
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
++  set(LIBALLEGRO4_LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS} ${PLATFORM_LIBS})
+   include_directories(${LIBALLEGRO4_INCLUDE_DIR})
+ else()
+   add_definitions(-DALLEGRO4_WITH_RESIZE_PATCH)