diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-02-17 10:40:50 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-02-17 10:40:50 +0000 |
| commit | e7258d73472d047be80d75fdf535146e05d0a08b (patch) | |
| tree | 23db7930b13c362ad423d5c451deedb06fab23f8 | |
| parent | Stable for amd64/ppc/x86, wrt bug #540346 (diff) | |
| download | historical-e7258d73472d047be80d75fdf535146e05d0a08b.tar.gz historical-e7258d73472d047be80d75fdf535146e05d0a08b.tar.bz2 historical-e7258d73472d047be80d75fdf535146e05d0a08b.zip | |
Avoid build failure with USE="-qt4" wrt bug #472220.
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
| -rw-r--r-- | app-misc/recoll/ChangeLog | 5 | ||||
| -rw-r--r-- | app-misc/recoll/Manifest | 30 | ||||
| -rw-r--r-- | app-misc/recoll/recoll-1.17.3-r1.ebuild | 8 |
3 files changed, 24 insertions, 19 deletions
diff --git a/app-misc/recoll/ChangeLog b/app-misc/recoll/ChangeLog index 9ced06f63ab2..a901a10423aa 100644 --- a/app-misc/recoll/ChangeLog +++ b/app-misc/recoll/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/recoll # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.25 2015/02/17 10:35:28 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.26 2015/02/17 10:40:40 kensington Exp $ + + 17 Feb 2015; Michael Palimaka <kensington@gentoo.org> recoll-1.17.3-r1.ebuild: + Avoid build failure with USE="-qt4" wrt bug #472220. 17 Feb 2015; Michael Palimaka <kensington@gentoo.org> -recoll-1.16.2.ebuild, -recoll-1.17.3.ebuild, -recoll-1.18.1.ebuild, -recoll-1.18.2.ebuild: diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest index ae1f85e8ce0b..ab4d3d161cec 100644 --- a/app-misc/recoll/Manifest +++ b/app-misc/recoll/Manifest @@ -3,25 +3,25 @@ Hash: SHA256 DIST recoll-1.17.3.tar.gz 1757278 SHA256 7778f80546e6b10ca45bfb7f8bb0876ccf3987dd4e98c5003ff923bd8b5acb1c SHA512 b41d28255e6bfbfc8e0025d88c3d56ecfbd35814bfa359c41f3e5d3cc25debe6d66dc617aa4c012e1911aa8c373c48a1661f7fff926e2cce423562af82c2fb31 WHIRLPOOL 3ba9d58a0df401832b1a97f34f4caec1b79aa7de027b936b05195d447e374097bff9205714b1a97c287610c74c0ec2e7e726b144c2295859c293a013c3564644 DIST recoll-1.19.5.tar.gz 1997615 SHA256 c4d63a4cd1a598117a521a883a6078082b30fe63eef84a879da9b467fcb56a8d SHA512 45ae5dc6d4f6d6dbb3d7e634bd60a2835b767e5d2d8d188636ab4b1777d65a6918c09d5bc09e80e4849aea6e8b2c9c430b99a9e56b645531065e558f4161a5f3 WHIRLPOOL df099f39a681aa1956076018861d064445bcb9fc050c866133a830ebeddb33efcc9a06596ce18d17d80bcfdb663bb780434719092c6c571f42b6093a4c750be3 -EBUILD recoll-1.17.3-r1.ebuild 4269 SHA256 d10cf7640582e8d5f86b3043a4a4ebdfb1cf46ae9a67525ab019dbc486729367 SHA512 ac16e26016bf5e8768215b2a7e2a8cb21e331c73e3b25c0c8d102479134f8e397d289536b5ebb79ae66ce0d07d4a7eaacaf117695612f2f6a3f9d1052c61cdca WHIRLPOOL 6aa5b8e9f6c27bbdafa8318c4ac5f4163630c9615f760956d7721b41b7a4b3487f608ba27448d9a49d872f4150b2e698964f1e1454c2207677e78317b086ce80 +EBUILD recoll-1.17.3-r1.ebuild 4299 SHA256 e98ded28e28d29fcdfa5e4d386f3580db9901a1192ecf79b95ea722a625a8c8d SHA512 f32e9c2198db2cf281eebf61d63cb80f71e98f487308f82c963076aedc33d24dfc8b9538b4611d8e051bf0b8839a516c6becc9ef60d22ed68c27fd280a06dbec WHIRLPOOL 9ba777ae1811ab6094c07874c0b0f16e8d061575e9aae2817ea4cfbf8eca72ca1c71bfb74a41ff5127aa4aa5209e393309034a487e4e1d1fad769e79ff49f6a8 EBUILD recoll-1.19.5.ebuild 5002 SHA256 ec73b7ca4294a6d73635676e3af347221a88ecae627438b1367ffa3087d230ee SHA512 69f611132d5698aa4dfc977954fad3a987fd8deb1eb4f75d475e440389dfa75dccf278c61a97353f50e40e0ac158f1df323324e3e99b144d111624b95118b4bb WHIRLPOOL 14c020a16a1e00951ad33dea79d7bcc136a78643f4bd19d41a79c83ea6ad11d870506e28b15affdc8e80251833eca7d47468b3c69a3afb2b2e303f39c7f6969a -MISC ChangeLog 4157 SHA256 bb6c13033a792592dda3116bed97d03e65edb9bc6b35e54156c61f2ef169e000 SHA512 23940338ba348b5f17e77e1b6f4de3ec0f3a74ca8a7346809157d827f4a80159047bad81ee9db0b327a36b6d7475f5580e1952ac0f14993d93e061fa294fbd14 WHIRLPOOL 3ad91e2df434e88f2d047e1f196b2a38bf644cd0451e8833cfbf88672d463f891201e9456230fdc320ee44ac80181caaf2353a0c2356f582215376e212adf46c +MISC ChangeLog 4294 SHA256 1397dd74727b9437978825d22ecd8f3a0ce1c7d3b2a7845de2279f85418a78a5 SHA512 8ba136f2b9c5f80d8e22c2433df5503ed6adb7485d759520b7b9df672a4f3c484d38f5b7f5041e453c898d35b7f8cf4a59762a8d9d275e0a7c5b8d965635542f WHIRLPOOL 0b3dab192a24458d99d6b44abd1c3dc18b03b56bf8ab0c6c299f7176e01e4afcbb6afb00dd2798cfe18bbab25e4a18e98e932c26b3fc9224818fc708ba4560c3 MISC metadata.xml 1285 SHA256 ee6805155769028c47dae3121d636b2700d3427cc80352626ea07c5a9d5e6c39 SHA512 dd69cc656c35126ad40a590cf92eb5bb64660e4b43efc30afcfa2b5f2f863f212f800b5c539baac4743a0b56767125f985db1d7e3937cf894a83db41508dbd69 WHIRLPOOL 4db0d78003cbde0dc8992cc0198507a5f96bf4feb0c242a11129cc633b17430b94d322e6209f86a09b721553f9278f6a4dd09cd0857ed7554382f09d61c982a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJiBAEBCABMBQJU4xlxRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +iQJiBAEBCABMBQJU4xqqRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7DldD/9ekMPPs+tHxadPLzly4snjncppIPpDE2kqcuHQ4IAdV6quDAIYbIyFqGHi -D1mmnB+BWkkruk27u25O4o0TIYcppOXBh/L7RUlPYV6Abm9bGlEsMk+H/yztSOKm -M3pdo0SEYxdk12JI2jOO+Kc5yKc83JuwpTqh0gwe4zmYSXQ6SYBIQzV+eAncmy2e -dnIa6maGA8lxIAMfuwGly8qp6xHGDH+HNkxYouXBCbqoIaLNM5jpon4qsBClAIW5 -QYySSYUUjjlz+scCp1WQWdzPD5Zbx0JO9rg1tNamApk+NTyRARE0BpUpuY+tM+7J -h/8Tb+D6twrY+VZN3jiCfOlOrM/8T71HCxA21w6d7kit4ktgvG3EIRmKSdojxupp -5L3AUX3CUtk4WjruSO9Mx/IvrO5odYf5V+huOUL/Uof2ROyUWkTd+tM2nX2Y9zC+ -SW0AncApsHvK6bbUCbs7nryYDXbUzzUYQiEafXyDLSi1qsxacMjZKT06sSXzH+AD -9kNYgcIeLsd2rROGTeV1bWG1KR8iv3XKUHgvQ54wzUHPFbGpzH4a8/mKxluzJjAZ -3/p2zBQTnUAwnESx6vzSiKZyWwXDayVlrVjmKhsIfVgKo4H3hJIQ2jd/1kNqWxnN -WU05cXUqJC1ffaL+LyK6rjQBjZTpb2x6K6NS3J/dn6DQ+Gqm0w== -=tHPq +7E5QEACyiBBr/tYUri/mavrHbbhElhLzU14bJxJQWQKNPYOTCP6+coQu9k2SNij3 +GHiLXU6tld6SzQLPZwMrTGbiA6XFXVFomdypyXCZX5rt+jTGbcXMBAGP4UdX5EqR +ZiKb2iBdVGKoC7cLuXEE1CWYp5dC66eEGO1VqB2tnXo2/CSKXwebIhoqsQe/SMGi +1CHDH/sEEsJdMZsDKc1LJIdFlzEJpa5XugLo636dQlKOf77FPB5nUErKn+kp4rPl +odWCOtdTfdlMvKrir4Ns+bLwJcVgmZFbKusI1Xrj055cf25ZuKUgoZTeXZBKtXlA +WcnVVTrR4Y/gGiXdMXtL14bpKEp9CnGTXfUQbTm3omg+O3wF1oRYqWkBP5Bmy16X +HuY7b2G3nBTHseAhXKwyY1U7ejdkHhnHdy1xvQH8ZuLYSDZUgfzM4uCUDTam6Eao +H4jij7ROHNnejKhN7voPy1wBPFaiXHudUF3EPqNxrZAS8JlRsC46HkcS6cwmtkPp +KqDpSiBwaC5WaMdBiA68zomb5ozU4ulnrMC4yHbJfmb7IejSb02FxdTwfX07wK1/ +s7LqKZyIZjJenLkWGAzWGSu/dKOpaU8iIwF4JhADnyZA7duv9geMI0Pby9cB/0pR +/5FjmLYzQ4CWHiUMM/O/ZcipqboHU5NWKxI7u7LMre0wdFaKjw== +=uLKu -----END PGP SIGNATURE----- diff --git a/app-misc/recoll/recoll-1.17.3-r1.ebuild b/app-misc/recoll/recoll-1.17.3-r1.ebuild index 99f44ed6570a..d052cbfc159c 100644 --- a/app-misc/recoll/recoll-1.17.3-r1.ebuild +++ b/app-misc/recoll/recoll-1.17.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.17.3-r1.ebuild,v 1.6 2014/05/17 07:32:01 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.17.3-r1.ebuild,v 1.7 2015/02/17 10:40:40 kensington Exp $ EAPI="4" @@ -115,7 +115,9 @@ src_configure() { $(use_with inotify) \ $(use_enable session x11mon) \ ${qtconf} - cd qtgui && eqmake4 ${PN}.pro && cd .. + if use qt4; then + cd qtgui && eqmake4 ${PN}.pro && cd .. + fi } src_compile() { |