summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-08-04 08:01:54 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-08-04 08:01:54 +0000
commitb82e5840199051e643f7cf499434d8b6bb777834 (patch)
treec4793a18754ff563cc294de2ec08a785f177cfef /media-plugins/frei0r-plugins
parentclean unused msql use flag (diff)
downloadhistorical-b82e5840199051e643f7cf499434d8b6bb777834.tar.gz
historical-b82e5840199051e643f7cf499434d8b6bb777834.tar.bz2
historical-b82e5840199051e643f7cf499434d8b6bb777834.zip
Respect environment CFLAGS wrt #418243 by "thomasg"
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'media-plugins/frei0r-plugins')
-rw-r--r--media-plugins/frei0r-plugins/ChangeLog6
-rw-r--r--media-plugins/frei0r-plugins/Manifest32
-rw-r--r--media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild9
3 files changed, 30 insertions, 17 deletions
diff --git a/media-plugins/frei0r-plugins/ChangeLog b/media-plugins/frei0r-plugins/ChangeLog
index 0f2db8e5c8d7..bc6f7e3859f5 100644
--- a/media-plugins/frei0r-plugins/ChangeLog
+++ b/media-plugins/frei0r-plugins/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/frei0r-plugins
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.19 2012/06/14 14:12:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.20 2012/08/04 08:01:53 ssuominen Exp $
+
+ 04 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+ frei0r-plugins-1.3.ebuild:
+ Respect environment CFLAGS wrt #418243 by "thomasg"
14 Jun 2012; Michael Weber <xmw@gentoo.org> frei0r-plugins-1.3.ebuild:
ppc stable (bug 394291)
diff --git a/media-plugins/frei0r-plugins/Manifest b/media-plugins/frei0r-plugins/Manifest
index 0f03190f0a73..4c7d0ab2b7af 100644
--- a/media-plugins/frei0r-plugins/Manifest
+++ b/media-plugins/frei0r-plugins/Manifest
@@ -1,19 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
-AUX frei0r-plugins-1.1.22-libdir.patch 1060 RMD160 c59266a3ce829d2141acdbbc089d496e7b212323 SHA1 35a00c5460d00a6764d7f78b96f85000f2c331b6 SHA256 69f3eb3f037da712a4a27a499dab732d4735620d83c7f3445f10e021c73ae99b
-AUX frei0r-plugins-1.1.22-no-automagic-deps.patch 2128 RMD160 8b6be3e1b2a66a2370080b041c5a4a565cd548e1 SHA1 459f6ab54c5ff5e5acff07348dcc56ebb0ca8ffb SHA256 7a727e213e95691d467597da1c7dd97cc28a1818b81509bbd4df5f738f77c102
-AUX frei0r-plugins-1.1.22-pkgconfig-support.patch 1072 RMD160 afc04b80c9df9e682efff9fcdfa80f0db5455062 SHA1 89398a72ed82594fe26d3284546bdb14882adb59 SHA256 cf2fa605e5fe32e43474a59610d65843e405002da39b67b5d0f9ab806381baaf
-DIST frei0r-plugins-1.1.22.tar.gz 570186 RMD160 d5f989583839fde1e15c791ed4c62eeda4ddb760 SHA1 2bd488fc0e6d12b2f0b141ec21a3c74b7c85d4b4 SHA256 436e933c079bdf8b3d2d2b2fcc9a601c82ba68f34af6f0716ba837041a149da0
-DIST frei0r-plugins-1.3.tar.gz 1092809 RMD160 abc279996bb5ffe83f796e1699c9b1cdbece60ec SHA1 f6b463440017934d01ac3c8fdf70b93c915e3d08 SHA256 b25da901115aa7f960cf5e541057266fddf132a7521d628e6cb344c9f16c0236
-EBUILD frei0r-plugins-1.1.22-r1.ebuild 1048 RMD160 3c4e9ad11a9d7c637c7c820616adf8f7077ae54f SHA1 c211624e5484f10a9ed02d25d074483c56b5f3b5 SHA256 465eb59c2a47edc6cbe7c258133163acee4df142f0b41ed5fcaff9c152c1d9f5
-EBUILD frei0r-plugins-1.3.ebuild 1343 RMD160 8f355ee683dc26ca4a70b03b1228815d2ec26d02 SHA1 a60cf2cfff79d29b827e8535f17c134c042e9cb2 SHA256 a0a014f33008b1af8e557dbf90ef6ece930c7804fd5cb42a2bf6689dd26f56b4
-MISC ChangeLog 3239 RMD160 f4531a7bcb541af7b8d49b8a0d78a25e3a1dc5b7 SHA1 dee5a307cd905c9c1c9fd0e4e951a1583516b84e SHA256 3cf056025fb88e99b60ffa267790b2d2569072111c07990a788d7ed6c8167abb
-MISC metadata.xml 453 RMD160 d54fd465735d542228a0f80d382616d9176a09d6 SHA1 6f86bb28c6648783483a4b9431522ae18029afc9 SHA256 021091b96ea43dc9024eaa225d6b4601251ea6b46e1f601ca423d996dfa80794
+AUX frei0r-plugins-1.1.22-libdir.patch 1060 SHA256 69f3eb3f037da712a4a27a499dab732d4735620d83c7f3445f10e021c73ae99b SHA512 ae48987dc64623e1c0528df5c064c5bce1262a3ed58cf9326e5b66fe4ef0fde030fd303d9000029d24338671e5f46ed3e94ece95ed87b2dd76ece560c1169944 WHIRLPOOL c4c0bc55530d40f08c41e65bfbf34409b94bc97462c4616561fdfb0a1fa8f7eec34060f0f07e6bb8b0580372cae7b05c487ac6642afe647d593797ea07d9ba2d
+AUX frei0r-plugins-1.1.22-no-automagic-deps.patch 2128 SHA256 7a727e213e95691d467597da1c7dd97cc28a1818b81509bbd4df5f738f77c102 SHA512 6f51704de419ba06ae6f5487377d9ac445127cf357644c049fe28d18bdc9d7c8456daba829c05fe95c46c4a1dc18d3ac8547bc172b76c27f149cd73100f9637e WHIRLPOOL 66192e480edbe03b3486900baa59360db68507e3ee2304dd01d24b960616d8d798b6867d8d92ffc6cc03d75d4d7bae7b0f97308bce5c836c9c39601e3a6237d0
+AUX frei0r-plugins-1.1.22-pkgconfig-support.patch 1072 SHA256 cf2fa605e5fe32e43474a59610d65843e405002da39b67b5d0f9ab806381baaf SHA512 6ab14873ad6f797e5307587aa94c9b342f3c8ff674d80d575e6e55beada932b1322061fa25196ce8b3a40abb91cc0aabf828fd18a622a8e3c197e1491ecd6827 WHIRLPOOL d7dcc0143ca37c375dccfcdb8845689fda5cedbcecdc8326859010d451a43f7435c76cad6811f7350ce44540254b94b7a4d5b661f12ec183641ee938f587acbd
+DIST frei0r-plugins-1.1.22.tar.gz 570186 SHA256 436e933c079bdf8b3d2d2b2fcc9a601c82ba68f34af6f0716ba837041a149da0 SHA512 1f071f57c784be065fb3af83936e540b5a89dcf5a44f17a31d61c07e8f99bdaf9ba5ce3449489adb2677e9bf906fd2dfce8e64bd28e433a3ef5753d9de18b06b WHIRLPOOL 64a367d22a027de9fea353dc1e851780f4bc0f40e45d6b640705a4df871ddb174302c3c14616c3adc9be6af266b35c701516498a8dff6d394f29b923769d48df
+DIST frei0r-plugins-1.3.tar.gz 1092809 SHA256 b25da901115aa7f960cf5e541057266fddf132a7521d628e6cb344c9f16c0236 SHA512 3fcbdb61b656db42b841df6485ca06e2fe2bb8ca16dc054f9154408f843c4170454f8b9fc619b49989f6da9990b67eb7ac6b548dd0fbfb560fdb0f2789346f90 WHIRLPOOL d79a14eae912bd9739b498c7e4d2949529f3e212835a337023bd9760bc9a1dbf239fb4e8cb7f038060d945932df725559fbf283c6362e2777d171126859eff05
+EBUILD frei0r-plugins-1.1.22-r1.ebuild 1048 SHA256 465eb59c2a47edc6cbe7c258133163acee4df142f0b41ed5fcaff9c152c1d9f5 SHA512 b8ea05307c6ff0e858056c02da5329d1733df287fa8f96ca065c65613c8ce9f5038a09c0388e3377f75c5d765857736e32450778fee4e23362f36c98545e1870 WHIRLPOOL 95be7573f072751f6558f3129147e133305a4e15011be941ed2d562a88ac4e8e04faee865bf96d35b64309090c35dc6229f05bc9cea599212f4e5ec6a9bff1f6
+EBUILD frei0r-plugins-1.3.ebuild 1481 SHA256 fe5f953d449c9ea737d1ee2c5ebc5f0a70ec9e20a74ae7325705325e6c72eba4 SHA512 de024134a07cad32d0f707f5aa4a59af853a1de3bc9a263ac466320983b9211e5dfd4e691a85471c9e10b41d13ffaa8d4aacca05d5758ac3be37d78187957e03 WHIRLPOOL eeb2802b1a2a5915d33045f5a2fbb3a81776bf1f2a4927b7c5b00c4639ad49e673fb67144155d4b377d06e4d3421412ed5a2129c7c93d40c74fcf0a19135083e
+MISC ChangeLog 3383 SHA256 b79757fd8d4681504ea2f7aa1c733d8782ea59a7657fa26f6411d6b42073d46d SHA512 41d89830857d23204a24279db2add331a55f0f2a1480a16f63f86f28600af8488a0bac57ca2cf745247e2e14ab0809e9a00bd2f376a0d9ef77d2425e05f35921 WHIRLPOOL 35327de9cbca71271cf0bd86a0c5ebd090ecbe462667bcfae2d0cba5ea14f232934e5c0c11ed26b63499ead82f575f78a0ecd7aa0bd5c0c840a5d5fed12d2013
+MISC metadata.xml 453 SHA256 021091b96ea43dc9024eaa225d6b4601251ea6b46e1f601ca423d996dfa80794 SHA512 7c4282b39f072d98ab15958777726debfc1ad31f4094cf67068593458def0f68d005d8241cfa8569c1d3005894cef48bd5e0e41b0c94a5499c830fafa013fbd1 WHIRLPOOL 343bf67279a84aaac07fa1b06e07391d996897fd6fbfbb2578826b80e5984198a5e3a49e64e4996601dfec89f7464f331d8d39b9eaa7cead814981f5339e7ee7
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAk/Z8SMACgkQknrdDGLu8JAzigD/bHmSTYe3M5lx+/3RPM9dvytR
-SzZ031eQtXMk3dDqLjEA/jSP5Sajm7egEZTefQcNrfGwJqUUbeOCWO4T4e1w9lXZ
-=8T+g
+iQEcBAEBAgAGBQJQHNa3AAoJEEdUh39IaPFNCCkIAIQQF3RZu1NNFeriXHJaN1IR
+ubJMl9pZzr+3avZOnsnwbbivm8gHiymwt7dfyHTowVpRCa9EYqJ0q0B69eXosYT7
+dyi/gyfaUziI7SpyRaFNLPq2VnxS8q4g5TflowuR+uMwvuQfubmpm1nUoe73DI+V
+Mq8PCUemroT+y16AYvRkhW+L46uZqm34l5wbHlAQAQJyHW/9G+OObo1cTIgd63O8
+4+LtLteJ3u1a0MGF2L7KYvVQWhDH1jkoWohgS1c+zuAjJlfdNCiv0QXLBaELveiY
+sYA1TfJiZ+6CaP9qlyBxzjZ+pUakV9tnkjqlHZmHRwlJq8ztM8ichKKoWNO5t+Y=
+=G9a8
-----END PGP SIGNATURE-----
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild
index 24068ade1c30..b911609d0a40 100644
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild,v 1.6 2012/06/14 14:12:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild,v 1.7 2012/08/04 08:01:54 ssuominen Exp $
EAPI=4
inherit cmake-utils multilib
@@ -36,7 +36,12 @@ src_prepare() {
sed -i \
-e '/set(CMAKE_C_FLAGS/d' \
-e "/LIBDIR.*frei0r-1/s:lib:$(get_libdir):" \
- ${f}
+ ${f} || die
+
+ # http://bugs.gentoo.org/418243
+ sed -i \
+ -e '/set.*CMAKE_C_FLAGS/s:"): ${CMAKE_C_FLAGS}&:' \
+ src/filter/*/${f} || die
use facedetect || sed -i -e '/package.*OpenCV/d' ${f}
use scale0tilt || sed -i -e '/modules.*gavl/d' ${f}