summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-06-11 17:48:17 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-06-11 17:48:17 +0000
commitca423c6a12fae8a717f4cc8f4fbc1a78d1e2a2db (patch)
tree4a23465f2c7bffe8c157b201fa06e33c79ed5ede /dev-libs/libRocket
parentCommit Manifest, hung GPG password prompt (diff)
downloadhistorical-ca423c6a12fae8a717f4cc8f4fbc1a78d1e2a2db.tar.gz
historical-ca423c6a12fae8a717f4cc8f4fbc1a78d1e2a2db.tar.bz2
historical-ca423c6a12fae8a717f4cc8f4fbc1a78d1e2a2db.zip
fix build wrt #512956
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'dev-libs/libRocket')
-rw-r--r--dev-libs/libRocket/ChangeLog6
-rw-r--r--dev-libs/libRocket/Manifest36
-rw-r--r--dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild5
-rw-r--r--dev-libs/libRocket/libRocket-9999.ebuild5
4 files changed, 29 insertions, 23 deletions
diff --git a/dev-libs/libRocket/ChangeLog b/dev-libs/libRocket/ChangeLog
index 8c39af5cbca4..81bfc7256851 100644
--- a/dev-libs/libRocket/ChangeLog
+++ b/dev-libs/libRocket/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libRocket
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/ChangeLog,v 1.10 2014/04/28 17:31:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/ChangeLog,v 1.11 2014/06/11 17:48:08 hasufell Exp $
+
+ 11 Jun 2014; Julian Ospald <hasufell@gentoo.org>
+ libRocket-1.2.1_p20130110-r1.ebuild, libRocket-9999.ebuild:
+ fix build wrt #512956
28 Apr 2014; Michał Górny <mgorny@gentoo.org>
libRocket-1.2.1_p20130110-r1.ebuild, libRocket-9999.ebuild:
diff --git a/dev-libs/libRocket/Manifest b/dev-libs/libRocket/Manifest
index 36b91df0f4e2..853c0ff6d17e 100644
--- a/dev-libs/libRocket/Manifest
+++ b/dev-libs/libRocket/Manifest
@@ -5,27 +5,27 @@ AUX libRocket-1.2.1-build.patch 1194 SHA256 9650d7a94fea3220c15dcdcd4002df95c025
DIST libRocket-1.2.1.tar.gz 1796018 SHA256 05c92515031ebfa5b1e9421d88116a60f815818c97004947a16ce6b4c77563a7 SHA512 49210bf7f4867103d0149a789f020388a2ad533ee684b52d8d2ffdb38f41fe873ffc389b79a20a7020506b368394a0fde7a8ba5cb495576edc16f1b12f520e41 WHIRLPOOL f9b8f9d30c3f94028d623f22b8169a4a101fda5f52edd3a21d05b9a56c6410c94788e1226c4689361a7a8198973cf4c6819cd3733fe69d3d8a93edffad090e06
DIST libRocket-1.2.1_p20130110.tar.xz 845572 SHA256 5661f0d1b0a3e19b9f2856b9927ed7ec4ad6939e732230832cd701bf078a732b SHA512 1c474e0cad2e13ebe6102cd5d31c3fa61370d23062c31fd7703ec431f0da56f008c9711b49b73d8a9b32af0313e2cb3aa8c46888a36044fef05c15fe1cbc23b5 WHIRLPOOL 52ef88ebc35ac762c6b50fbaed8713b2568f80bc65390e696537f4935eaf1c4182a64b414fd6bfadb3e1a6cadb0589fcb20bc12c26e3ea87edaf342b5ff09bb6
EBUILD libRocket-1.2.1.ebuild 2013 SHA256 84378b7230ea2e43a6338592c98b6fd3d0fdba89475f7864077bd738a3e2e39c SHA512 e8c51802869d1fe53ba10491a2dad192e62e7e689e306f3c6f4ec4d07e2bb0cce8f0c3b24e82d81a881690293b4757853fd6b57ebbde357b134f1170cf43cdb7 WHIRLPOOL 51265c1a36344b349546e33a7fb0cf688e6368bdaf048fbc4826391ae23aeb9d317969bac078ef0c76a0f5eb4c78e461ccdd171b85eeaedc772811d2be4b0673
-EBUILD libRocket-1.2.1_p20130110-r1.ebuild 2311 SHA256 801be65c8bebe2c9842d0608e898337d63a500cccb35a5c9bcff1c939a830c52 SHA512 7d80b29c076c6a08b1e604bdac208fd12c6241b8937c67ad0dcb5effff43aaacb476f5807436ba64e0d15be148a1fd3b397dd67c07bf32cb55fd78e4e5d36415 WHIRLPOOL bcde03678d6bbc5fcabb9da627e3537a4764fb3768ad39f931a323edeff0723aa593bf2f844ddb88b8847235cd49533a561450961760df30fb82d787564c2b4b
+EBUILD libRocket-1.2.1_p20130110-r1.ebuild 2352 SHA256 1ef92cc25c6b947da4c4176af07fe11cd1a9cc450740c0b44b704dffed51847c SHA512 bd525f171703db65b13827ff8c5a56c016dc5b2562931cd304ba6b408f5f7f92b23438583eefc5e00183c418dc27c5f5d6edbf1b339ec972b168db7157eb058d WHIRLPOOL a9c3999f70a602ed9254dbea390b627dce8592c98f4981de6185e4c9f795796b92424067d16ae108ebc50f505507ced6e41ba6e8f535a54f0cfffbf95becbe37
EBUILD libRocket-1.2.1_p20130110.ebuild 1956 SHA256 20d3b62afb3ae3de34459cbd3245eacd238773a95f5c9a55fc46107060622867 SHA512 80876b31341ed92afcc5b0ff6f32ef15680ba78b343ba54f56ee2cd5c4d1a0e24c9b1e22e6b76921be11f0647763b88f8709f1bfa00030b140035824da282de7 WHIRLPOOL 14d828e36a904f796b9b3615c2ff36bfdaba8d1b3e08c2893049856e59cc926c76fd52295526a1cbba038cb44698077a25d37c25018626551d288c343392355a
-EBUILD libRocket-9999.ebuild 2288 SHA256 6a3227b488d34c847d42b781696f52e0f4e29af5bf21acb0a4ffb03b692beb07 SHA512 d47915c7122294405b96ebd63eae52834bd1bf496b4de6ceb71d96539e30fa8586380579fdd4c5619c93d84fec8e5b3825b13e218655d656f499e3af841378e1 WHIRLPOOL 74f61bbc1e16b25abcbbdb4f045a882f2482ba4229fc3f40cb49ee0e3912d45bc667e900a720a38e88bf45d87829c1571e189cf784a255ed3d3fd542a0e1daea
-MISC ChangeLog 2146 SHA256 85c1dbfeeb8e683776d2e0ced61b9f59aef89f4cfa5b8e82e3f23f36ca4624c6 SHA512 35ffd63324ae9f55e8e2f41e2024ad6558f95f22f6286bf7b009331ab53036233707b7d2d8094f110f672fe249c88ae683c61454d8af7684a3781f6ffbba6431 WHIRLPOOL 7c2349beb0c4c2c7a41bff50c662b0ffe2796bebdfd5af1e90f62354764c45cfd013ecef05de5bfd9d239c21d321f24af02dd0b0244254b25fb1f4779f020a9b
+EBUILD libRocket-9999.ebuild 2329 SHA256 d557633231cce3dab2ddadb7bee6ef6bd45cd66686199740888cd3de634e9943 SHA512 7a22de6c37191fc25d150b0ba080ddfebd9ce1a7e700d80b9a29392292a0cb330321cd48d29cc5b39129f079aad49cb16805d61c90178f8efc1506d879aeff5c WHIRLPOOL 52928038980d8efa2d19431dc374ed3db0acf49b8f093f444a2d0b2fbe68a12a3b722137e798634c51312b0703bad8c596c8ca28c058fab513d6d2dc637f3b11
+MISC ChangeLog 2286 SHA256 b37f2c0164401bc2140fc97ac7739c8d406a28f0902b63044f5bcc276863ea91 SHA512 c66c20a5ec1e1b60e65839248432bdcb38ab13ee265447b963415d13418c227103e0a5ec4b46a3f80aebc657b935de703743e7fff4636ed0f519f3212047e583 WHIRLPOOL a3607064a5d3270013e426645ce4322de5340ce2b9f096681e9d5577bdc09f477723b71d4cf9d56ddcb8ed37b55adc36007d37c25243128f9ac464d68696469b
MISC metadata.xml 294 SHA256 d42b1e02c3a48eab00022cc811e6998351b7c19691fad42b10bda6f3db8aaaab SHA512 0f5486821b3585889a6c955330f2c781356e370b245ec8656111448467a59c9fdc41fd15ae633737aa46ce48b86abdc3247bffd979da00e25c756758ebb77451 WHIRLPOOL 4d8bcc430d64d761d7e134d31627d0d43ff201b990dec3da289f0fa50d33702dfd1638d6c0da7a2601ce49a130266526284d341d4d2f50e289b36079249e4231
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJTXpB/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObn4P/1MdbHwZUghohXnsHy3QY0Cf
-BIgfg8ttkW7BDdi0pNU+nJ/Ef71/oFZk3kc+cLg32i9kXsFPKFPaPXN6E3lmH/JE
-1a5C6LF2fFPt8oRhG+sQguupFBIfDY+6izthIBuI6AWzsfQZp2m4kHHIvvRx8y2B
-LJ7YOVOrxjOP+RAMIGnEMQwYQqyvxtT0tGYSRINW64IQ/S4fWd3AIdehW69YkWzz
-9u0LAAs6qeAqKdxzjMzqUiEkN+VApoNA0PGQFfTDbaajxW1Kb4BLdN2Zk3kJc2sU
-sSQ6shQglEA2yu/1qhafoClBotkcB69hs1fPNvCW+D1fyNI9HTLXxCt1WFth0j3m
-IYpL7xoQUAR/HiKCn3cJKDiZT449fIbO+O/C0b18GomQqylhf/RLpY9PfxqKW/h9
-0Ml7OVHqDPx5pwrOkAn3zFfpVJ3F3NB9u+JCcRpU92gj4iALc3hMioixGcH18JB+
-nD+5u1ZNaSE8NjFqAhWh0cMnoN1rdV5+ZU5FRTa64AEBKnAp/Hy7of3YWkUBOuR7
-gLcOgic+fahPEf++lqmFeG3YT4r+MnPfqthZV5LDaVZuOdn0/S2hi5PW8uPvVk9U
-2YHlRF4KZb6a+OiGxOdbfrSaTjhIrIsqMsTSFUqQCG45Dr8R4GGgD1lYJBZSI2Kq
-sU4TwZXJf7P2eZ3KJLA+
-=fJuT
+iQJ8BAEBCABmBQJTmJZeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgSi0QAKrp3pBR28QH2vkFazC5xDX2
+ygoT/SjHU6EVpdN4mFPbfgNve9lnzeGy/CP82qMEbK7kO/TfpI/F/pydZWRWJpe+
+GAs6LukrpCgkVLR0wXFKV5sCq+l9+PFyt5I7ntF4rUALFQUyeoPCfECNSV1e34NI
+XR1yArYS206znDwnSUscQuws2Fp/SJ2R2txubp0ccIrH9CGBZvHwNipKMYTNt6GB
+beKdWALy3qi5lNU4ir6jio6+TuxINKdp1Si6w6keqLss9lnphekySL1s7fRQgQcC
+Ph+tGiO81WHQQAZc2ajuBefgbmHK9HvloxfkmbS9qP3bZRNBAIBtta0oThLYWEzy
+CiQwWOCPpDG8CFjgAlaV48jTItTXrC55Vk0spzL1ZqEu7DN9Rp7fPKwB2JxZ/hfq
+D+PPeUAB0vMtHoYQi8orKCQvs7Fr43AJOQaPnPH2XYpR6rapnF57fMDv+s3aQ7fy
+Q5VwHGs9I/UpgyJ90IJcM9lfdG/xu2ZAtBy2hPX8XrcsHVMeZm5tag1fEho9q8kW
+76BknrFFtx0I19X8wJ120EaNP4sfYfM8uXzwZDAPPUsJAAC4P7X0fv7g9xum6hNv
+ug9CvIpuSjt/xz9CDRbpyiTpLHbo5ha2QpGxQCglnDlnoUMvEv52i1gwwfWr8soG
+RrkqfGo8iPR4+azzkVU8
+=YXtP
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild b/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
index 8d0bc846ccdf..f4e283335835 100644
--- a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
+++ b/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v 1.5 2014/04/28 17:31:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v 1.6 2014/06/11 17:48:08 hasufell Exp $
EAPI=5
@@ -66,11 +66,12 @@ multilib_src_configure() {
multilib_src_compile() {
cmake-utils_src_compile
+ local abi_build_dir=${BUILD_DIR}
if multilib_is_native_abi ; then
if use python ; then
buildpybind() {
- cp "${S}-${ABI}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
+ cp "${abi_build_dir}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
}
einfo "compiling python binding"
diff --git a/dev-libs/libRocket/libRocket-9999.ebuild b/dev-libs/libRocket/libRocket-9999.ebuild
index 2dce85a5d53b..90b0c5a7b226 100644
--- a/dev-libs/libRocket/libRocket-9999.ebuild
+++ b/dev-libs/libRocket/libRocket-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v 1.7 2014/04/28 17:31:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v 1.8 2014/06/11 17:48:09 hasufell Exp $
EAPI=5
@@ -67,11 +67,12 @@ multilib_src_configure() {
multilib_src_compile() {
cmake-utils_src_compile
+ local abi_build_dir=${BUILD_DIR}
if multilib_is_native_abi ; then
if use python ; then
buildpybind() {
- cp "${S}-${ABI}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
+ cp "${abi_build_dir}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
}
einfo "compiling python binding"