| [proaudio] [2897] fix gentoo bug 516710 (thx Marc Joliet for reporting) |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2897
Author: evermind
Date: 2014-11-04 09:25:30 +0100 (Tue, 04 Nov 2014)
Log Message:
-----------
fix gentoo bug 516710 (thx Marc Joliet for reporting)
Modified Paths:
--------------
trunk/overlays/proaudio/eclass/exteutils.eclass
trunk/overlays/proaudio/media-sound/minicomputer/ChangeLog
trunk/overlays/proaudio/media-sound/minicomputer/Manifest
trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-1.41.ebuild
trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/minicomputer/files/minicomputer-scons_link_with_libm.patch
Modified: trunk/overlays/proaudio/eclass/exteutils.eclass
===================================================================
--- trunk/overlays/proaudio/eclass/exteutils.eclass 2014-09-21 23:13:04 UTC (rev 2896)
+++ trunk/overlays/proaudio/eclass/exteutils.eclass 2014-11-04 08:25:30 UTC (rev 2897)
@@ -69,14 +69,18 @@
# syntax same as sed
# ESED=1 emerge pkg # will show the differences produced whith esed_check
# and placed the pkg in ${S}/esed_patches
+ESED_CHECK_ONLY_WARN=0
CNT="0"
esed_check() {
# set -x
die_msg() {
- eerror "failed to patch: ${1}"
- eerror "Sed argument:"
- eerror "sed ${new_args[@]}"
- die "sed patching failed"
+ local l_act="$([ "$ESED_CHECK_ONLY_WARN" = 1 ] && echo ewarn || echo eerror)"
+
+ $l_act "esed_check: Failed to patch: ${1}"
+ $l_act "esed_check: Sed argument:"
+ $l_act "esed_check: sed ${new_args[@]}"
+
+ [ "$ESED_CHECK_ONLY_WARN" = 0 ] && die "sed patching failed"
}
local uniq_backup="esed_bac${RANDOM}" # needed to find modified files
Modified: trunk/overlays/proaudio/media-sound/minicomputer/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/minicomputer/ChangeLog 2014-09-21 23:13:04 UTC (rev 2896)
+++ trunk/overlays/proaudio/media-sound/minicomputer/ChangeLog 2014-11-04 08:25:30 UTC (rev 2897)
@@ -1,7 +1,12 @@
# ChangeLog for media-sound/minicomputer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Nov 2014; Frieder Buerzele <evermind@xxxxxxxxxxxxx>
+ minicomputer-1.41.ebuild, minicomputer-9999.ebuild,
+ +files/minicomputer-scons_link_with_libm.patch:
+ fix gentoo bug 516710 (thx Marc Joliet for reporting)
+
08 Jan 2012; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
-minicomputer-1.3.ebuild, -files/minicomputer-1.3-fltk.patch,
-files/minicomputer-1.3-respect-tc-flags.patch, minicomputer-1.41.ebuild,
Modified: trunk/overlays/proaudio/media-sound/minicomputer/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/minicomputer/Manifest 2014-09-21 23:13:04 UTC (rev 2896)
+++ trunk/overlays/proaudio/media-sound/minicomputer/Manifest 2014-11-04 08:25:30 UTC (rev 2897)
@@ -1,7 +1,8 @@
-AUX minicomputer-fltk.patch 449 RMD160 46805eefbe2f65df85600d7701dad5f18d172c51 SHA1 35e98eb05b41aefb89ff97002a5f46009cfd9d35 SHA256 010df702b062510025af0440d2ff16feacff43f9a632c3111a2e5e88c7a6dc6b
-AUX minicomputer-respect-tc-flags.patch 2085 RMD160 93a1932a80319e9dbe003a1ee1e0176fedc8a978 SHA1 7dcab3a996474e79eda77027df349d637e7dadb2 SHA256 5a08d1717a86dcafa73a74f04f870b704693c730ea94c322233204f18c3a0b45
-DIST MinicomputerV1.41.tar.gz 635355 RMD160 837c94e388849b4c7e1264d86650bf91e0f2d054 SHA1 94e7547a96fc78142e34881e5c4442e451a0526d SHA256 b4d5f0be2b9af7ffcd2015d00c8e582959ce8e6d3b039f90f5551477b12d67e2
-EBUILD minicomputer-1.41.ebuild 1132 RMD160 b4361e98dcff832183558ab71efd736a60a6ce3e SHA1 b89d82262db91f9244d275cdbba09e085aa795b3 SHA256 27134804ea3e1be744b631034a41cf43e5b6b4437c06e3aca764804f9619aa43
-EBUILD minicomputer-9999.ebuild 1209 RMD160 7563daa092a14f6b1bb130abedc77949e71412c3 SHA1 10f79b4bc62d4b3c415c39b404df07c4f9334327 SHA256 369d73ef7eacad2abb60379c71b6ba0c5b16da701479af7df32353af627b4670
-MISC ChangeLog 1633 RMD160 f0867f03155351813313963ab19d9e8c904581c8 SHA1 633d0fa74d899112cd391cd30d56d499960e40d0 SHA256 fddc1f4bb7b4f9d6374034560c7f1921eab85ef4998ca5b52c5bec173fadbf74
-MISC metadata.xml 246 RMD160 cdd725771833663c8cfa684c4c71e57d86d9993d SHA1 973be5799e631fd26fb4abcfc8da942f2f759d06 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f
+AUX minicomputer-fltk.patch 449 SHA256 010df702b062510025af0440d2ff16feacff43f9a632c3111a2e5e88c7a6dc6b SHA512 f39d0fc421798b4f00273d5ffbbebdd7efa20d0be696111fbf32c8051eede6c7a6c4b9ea353faac7f25e8c52f42929e14d31c15a9aa47d3a10c82f62388650b3 WHIRLPOOL 9252bff5bae3aa334f053ec686d9a45b90c92d314335f583e479ad2bfbc42ace6a238807c199e3705496553d6bc36173fcdba832f0b07eb6212ca625714eab17
+AUX minicomputer-respect-tc-flags.patch 2085 SHA256 5a08d1717a86dcafa73a74f04f870b704693c730ea94c322233204f18c3a0b45 SHA512 f4299eec5cd158c2b2eaba59a26c972c7663181da97025e17fd2c1e42688caae6735a49161aac9cf6601b447e963aa913255dd9993f77480bb5fb8edaa3c35e3 WHIRLPOOL 268cd82afbe526a6b3be23f79abb0cf375518f6748bd49f78c6a0f06e4cc253f7996768b5b22316a04bb41cea90e2cac8ad1e721a1d61ae5c6c8843c35552155
+AUX minicomputer-scons_link_with_libm.patch 385 SHA256 318a1ba839b99bcb93fd2e3d1933ca5a4859cc3d2c418379a252f1c19c025fec SHA512 af1429fe9ae6b113418fbac487979e243a7811659fcf594f4f492de9ecc99b327905bcab2d1e2007dc337521806a318cf23b9c35911964a28c82bd0142123c91 WHIRLPOOL 17bb65804f14b22a67a88761017073ba0971833b6dc42c917ee304cba9553914fe16560d12308e2fc8cdebaed6455ddf2b185db15729d710de4d1796eda5daa8
+DIST MinicomputerV1.41.tar.gz 635355 SHA256 b4d5f0be2b9af7ffcd2015d00c8e582959ce8e6d3b039f90f5551477b12d67e2 SHA512 df0c744d4a3d074243705f75c271a064040347983db792be19c65f3ccd4c5746602cc30a42841d87ef505a6ae6ae288f70c0e27a7d80a10847f971dfb989fbf2 WHIRLPOOL 56590adf2399b2bc334880d2dfe6f429d2c245f2c60f8cc0ebd1be019d2195ae1d91cc08aca3b64131243f5eb6246bd35674e1db189c1a02ddd272cecfd9fe38
+EBUILD minicomputer-1.41.ebuild 1251 SHA256 ea01bd622a34025a51510c80d3e1a0d357394144cd9a561911daeddd93908c92 SHA512 2abf860f3336415a77e85be821258c04d39d89f7481574d61956151a781fe540d00172650bb904605144014bf22b00f9dd2883569c486c9bad19181b76b43252 WHIRLPOOL a56e85eb72afb838e8b6b78501c6cce35c676fa8d2c5323387ea05e4a0298d73ca02340997bf75c1d5b213095d26a924b897e309f895fc2d472a51f7b029fd33
+EBUILD minicomputer-9999.ebuild 1304 SHA256 6f0e1ce1abaa662351d7b9b24f19e2a8145bed64b76ec260081b5b4ba674173c SHA512 ce50d6f692f0732826d2f1ee74473a8604cee27dd7f49e2dd255857ba753b63dc07d4a9d9624d5f5cda20b7b0d8cb92db15404419e21a055f890f9e41ad69cb0 WHIRLPOOL 0441412b8cd30e36467e34f8161a8e8b52adb90a9530b3e640a4786bb6ab0b4934d208eff47c5b6384120a8c95aea01f27778246468c701477d0576df3f02310
+MISC ChangeLog 1851 SHA256 4266bd28e94143859b09460fe3c55b4d0deb475010780f95ff00076c8e548992 SHA512 38ae26b4bbb4b702a319099c3ed5791d3be57e3dc7abb72f38197303ce741cc151a2070adb269bef01c14333c400d66a2f30659a5f4d9b15ec433a1c5040972c WHIRLPOOL e797a853519ea001d64906047986d08948e27b6657d5bee9629ddd96a74c369423d6901868b9d8305c4b60558b24ab6094e2d1229ec04297d7a2826b3e35b92d
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Added: trunk/overlays/proaudio/media-sound/minicomputer/files/minicomputer-scons_link_with_libm.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/minicomputer/files/minicomputer-scons_link_with_libm.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/minicomputer/files/minicomputer-scons_link_with_libm.patch 2014-11-04 08:25:30 UTC (rev 2897)
@@ -0,0 +1,12 @@
+--- a/trunk/SConstruct
++++ b/trunk/SConstruct
+@@ -48,6 +48,9 @@
+ if not conf.CheckLibWithHeader('pthread', 'pthread.h','c'):
+ print 'Did not find pthread library, exiting!'
+ Exit(1)
++if not conf.CheckLibWithHeader('libm', 'math.h','c'):
++ print 'Did not find libm library, exiting!'
++ Exit(1)
+ env = conf.Finish()
+
+ print"- checking dependencies for the editor:"
Modified: trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-1.41.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-1.41.ebuild 2014-09-21 23:13:04 UTC (rev 2896)
+++ trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-1.41.ebuild 2014-11-04 08:25:30 UTC (rev 2897)
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="5"
-inherit eutils toolchain-funcs
+inherit exteutils toolchain-funcs
MY_P="${PN/mini/Mini}V${PV}"
@@ -26,16 +26,18 @@
DEPEND="${RDEPEND}
dev-util/scons"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}"
src_prepare() {
epatch "${FILESDIR}/${PN}-fltk.patch"
epatch "${FILESDIR}/${PN}-respect-tc-flags.patch"
+ epatch "${FILESDIR}/${PN}-scons_link_with_libm.patch"
+ esed_check -i -e 's@// *\(.*unistd.*\)@\1@' "${S}/editor/Memory.h"
}
src_compile() {
tc-export CC CXX
- scons PREFIX=/usr || die
+ escons PREFIX=/usr || die
}
src_install() {
Modified: trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-9999.ebuild 2014-09-21 23:13:04 UTC (rev 2896)
+++ trunk/overlays/proaudio/media-sound/minicomputer/minicomputer-9999.ebuild 2014-11-04 08:25:30 UTC (rev 2897)
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="5"
-inherit eutils toolchain-funcs subversion
+inherit exteutils toolchain-funcs subversion
MY_P="${PN/mini/Mini}V${PV}"
@@ -32,11 +32,12 @@
src_prepare() {
epatch "${FILESDIR}/${PN}-fltk.patch"
epatch "${FILESDIR}/${PN}-respect-tc-flags.patch"
+ ESED_CHECK_ONLY_WARN=1 esed_check -i -e 's@// *\(.*unistd.*\)@\1@' "${S}/editor/Memory.h"
}
src_compile() {
tc-export CC CXX
- scons PREFIX=/usr || die
+ escons PREFIX=/usr || die
}
src_install() {