Use eclass functions, which makes this compatible with stable qt4 again.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog
index d55b6ecb0207aa31abee915809b1372095ac092e..c13c1d2986dcbfa7ca2720973d938ebe645b5e07 100644 (file)
--- a/app-text/qpdfview/ChangeLog
+++ b/app-text/qpdfview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/qpdfview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.66 2015/03/05 13:37:24 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.67 2015/03/05 13:48:24 yngwin Exp $
+
+*qpdfview-0.4.13-r1 (05 Mar 2015)
+
+  05 Mar 2015; Ben de Groot <yngwin@gentoo.org> +qpdfview-0.4.13-r1.ebuild,
+  -qpdfview-0.4.13.ebuild, qpdfview-0.4.14.ebuild:
+  Use eclass functions, which makes this compatible with stable qt4 again.
 
 *qpdfview-0.4.14 (05 Mar 2015)
 

diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 6f02e00e59ba89b6a0c1c212e770bb4634c182c0..4bb7129dbbbe5f85b557c51a99659b683a641c96 100644 (file)
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -8,27 +8,27 @@ DIST qpdfview-0.4.13.tar.gz 563548 SHA256 8ff563055fb4df476afed08ead465e6204c16f
 DIST qpdfview-0.4.14.tar.gz 591025 SHA256 69c685be50792256547ce85c672448bd655f8ca4a1a15fbf4e97e58d7f47a895 SHA512 f2503aca744a389a8b783329de5f67e338573672817e54d1762bc0e8de6652be2197c3a3787041c2307dc35b0d95d63d8a1b82f89647dcd30a9f840385427b1c WHIRLPOOL 6675493dcf0de8ad1a52fdd80afaa72bb6226ba193df5c2eb4da6bee2902602229c944497bbf36ac5b97a4ced3fd7e1de4f9137c000787b410a978cedaf01758
 DIST qpdfview-0.4.3.tar.gz 351371 SHA256 66c579e6e837aed532a1389ced4987cce1055cea36f8b3d61b634dd8cbdd8c79 SHA512 eff18828bda1fbec5004d301ba9beea912064451a3ebe686853dedc64faeb2a423a49d3cf281f48740e144552f8f3bec6be70bb5e38f4a6604b89e68fe5bfa3b WHIRLPOOL 74bf95f126d95efec68401d33391ce09b560f1ee4fa4a57e35e7941c9a33e55206b7f1a7771ffb8349447447e544f0cc9008f91c73f07f37d6ea73d2f290184c
 EBUILD qpdfview-0.4.12.ebuild 2445 SHA256 529979cdcf0097d7348603c2f8a691db3f62761fb22a42d9d5ce9d5ee569af67 SHA512 38ce32200f0ec8a4fa26c420af8b12a985c61414d592f84447365c55062d36670eb9371e575f9a845b85edd728cb96e6968ceec344d9dccbee33b06467429a0e WHIRLPOOL c44b86351f2c084f43376c98f799cf51be4f811a446cbb1db1dfbbbb6d48752ec12678c9378841a91e74fe5810319ac7f0ea6a139b7122ee5a432a9593163928
-EBUILD qpdfview-0.4.13.ebuild 2577 SHA256 78fac3f6e49cf13874881e3e92cb606ceecc6563bcd5f455e1e8ca9977f8134d SHA512 d85c370333635d21b2ffb9b903413641c1a64e255cf93cd4201f4c58e3bd7fff37f4b0b4401aea606f7c00a78dcaf11cba7997eadedff3b72849ef91d8bac440 WHIRLPOOL 2f9d60ee4d5fc1e3e75a86a16419ae2e2ec91dced0873c7d4a2cfec343391a0da8eafc662e752a8bd3e4c3502d6e38dd4ce728a22878361b3ef851d6fecba1f6
-EBUILD qpdfview-0.4.14.ebuild 2580 SHA256 aad004b289790200993eead7ac7168b862e56e352080d5050d3ff8381a822c62 SHA512 824f24e705f4e109bf56870ed7f9a50bcaefea524e198e35dc55b64d5f12f13f7c63d8b44922512e4944ebd5b00cbfc3b6b8551aaf52beae69f8acad66bd5f25 WHIRLPOOL bed2bba7cef1a1562db0b5ffdc2c11e642c18ff889815ee88caea8e27f6f59dcc9ebc3a4218f99a711b5992170d2b82519d88a4f2ddffd525cd9864800aab3f2
+EBUILD qpdfview-0.4.13-r1.ebuild 2531 SHA256 d4aba423853d6ab564be90932367d8ee48f1e7ce757d5a3db54afe773132634d SHA512 aa7a2c9cd778aff028f75ed75aed9a8b85c5702fc0ebade884b840956914e497f17d782909244f5575c91ee393757dcd298665132e5d11be6d8770e8db69ad5b WHIRLPOOL 86267a2972a747669e05268f58c6ae852b22d7229e3d398259e5c153cdec1987c6baeaaa9c468cd9abff7c2a7e34d8ab73321d0befd239a6e757f48d574116a4
+EBUILD qpdfview-0.4.14.ebuild 2531 SHA256 bcd11f5fd5b0d97b2dcadcb84c72530283097bc9e402ed79d27fb7d30ac013fb SHA512 fea8e3a2a31c078b24ecdc6c03f78a95478aa94042e07bfdf13b5c2910a969e810a37bef1afa7be0d1ea6c62cd637224057e186f77a6aab76a4847874277930a WHIRLPOOL 8b40d7c8411567cfe4eb79f5515197b6b7418770f24e59f521f5fcc0b0b3bd1ff7e6c400aafee100fb1959445059eadc0b0c9ebc4808f7e40bdec5dc131bc789
 EBUILD qpdfview-0.4.3.ebuild 1589 SHA256 ce39f08f84a3d6af4ccea913ff8cb0e863147a61618f6f7a842e9a8add1e5e30 SHA512 e9e55fe6ccc326442b371a17434970664ab07d50e5d9bfca89e2e5103c65ff9033bcf26a9e6d617dc19cba534f04b81b5b8f1b5fbd3c7fe362a576cb05fa8735 WHIRLPOOL 5dc94fd40476331cf600feb8c023e0ca194ba402a81fac19939367a8c32b11c782402176ee404f3d7953b344d0a330ae577e652e67ab5cea5d2b6aaa418d9144
-MISC ChangeLog 9910 SHA256 35f25a818035f10c7d518f913b4e53ae4e4991e4afb680014128b9d075c17b17 SHA512 046fe1ff636fee59a2f92094bc583d4cc576bac39671fea7bd2e328c074a7b0a9038cd8ba6c9c720c0d8281b7dff981e36b3e24e4ce77f961ef63bc0b57c51f9 WHIRLPOOL bd8cc1194396335c483227117fa7d7929168e6c4151ff28d7cad44070f2f42848fd46e95a9f52b875b35eaa386a31546e4ce2aec9fa7dc536fca1b19ce26c847
+MISC ChangeLog 10148 SHA256 81d042a602a2efcdc0e2b1785f9a6603ec3cac88a383e972d872998f0165b6b6 SHA512 98b82e6a1f9d4318a2000ce2533509fe8845c495561e2180691d4708cf60f3faf9f9dcbad3f952c47c7bbfd970071b4fbffd9295c6419f5a4bb361fc04ebeda1 WHIRLPOOL dd391d4be2d102d363649705b8e2eeaff25c483b800a95d4fd634148cdfaa95484a764fda107322fda5e47986a0eea8a80fa61f5e81966c46d3f83aa2dee22f5
 MISC metadata.xml 382 SHA256 9e69826293ad7b172ac7eeaa4225ed7b94d216b3f90177344a4e8af5a4bc9fd0 SHA512 ccc59884f91976f812ab407e257d680060285d14d60082b939a2c21eb3c1b8b7fa6a4ca2679d0a1413c98cb11783b6291688a3c2d56c33aa84e96a3687edc380 WHIRLPOOL c424dd8d895a393ef3a795cc24a1986525c487b75bddcd4cbab744d11e0c52971b591e017a76e3b282d4e100458ce92e9d2595fcc944d362eb5b79d4d15d079a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU+FwcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU+F6qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOhkQQAJtgZuKMuHs59luUgZ4OCrC5
-P+hd1+uiSSL1QoaXf2oTd5dvFN9kT7ASaQ5JkScm/E5+SZHi6VlA6Fj1InK2yJom
-/Zs9HZyoOEoOQBlMiKWR+e5diZ2lRLNyTOMihAALWKkTtp/csMdXmNKPCwJ29awY
-tvXuOxa4WK/Fflxv2C9cU1p+5HBPuqoWBQ4HuC/UFTn6KDApQqRivTi0b7G1NRP7
-54BQCZvZrUtdkdzkXcp5lsC5w7wCyc4WpUMKAWcp1wzv+oGPHf0wHIoYh6Pkmdfn
-fyQhsCyD7MA8HgFBa+KwlW/aiK8k4VkTLtUOTAJFNbd+0TBqazZhwHIP6YpmPcxr
-3ITRD/DMxbxu6jBZohVLfP/PFkFA+rU6CFUAROrOukgZxCUmQh0IKLwLUWueD6re
-apQ8sVFrvcTWe54h5QgDOLFjw2J2jy1ipxwQbcnVpex2HslcIo2FRszogR/iortB
-OoTg1x4flXfjWbKHcx6S+51nrPcCG3ydnkNojlRK5tMMwSBNGIhKRlYS1b0CW1UN
-Kpn5aJGstEoVupzw0QnWY4lGEnwT/YMGvJBBIsDw/P1KnEcV701stPB+/FFUm/2i
-4M9GOIHjq50yskRiMU8fwckixGpq1vCPaPut9weqN4tGH/lHHnGN72IOvUQZ+p5u
-ECqxWVo4JqyJuDtz0i+z
-=RKB3
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOfpgP/RUN0hVULoVbW42jJJygveyG
+mzybSCIYomnRNgrTQ8yEy/Oft7/d6/dQaAGz9ogxcXBeIeNBUDfzwvBLpcIf3+09
+CNa/AyoWikswtXjdfEPoZo8lRDmNdLzJE0W3U0CAGIREHY4pvrTs3EBTFUkpzMfx
+sJiIwvYkUPQJZiUp9gdlda/YeI9IQoJh3NsYF+j/EBP0mbSz5RmF4IGUGB6HE84b
+765yf2+4KoSBUwouwIG1blB2Tn9BK5ptnqMwnNcnfTqKlfZPD6jWFvPdnl0nIdPh
+SgxKBgHpSTh1RPnRLnAZbjWEGrH4FRRXwsutncRyfkdl57oIpteOJUyfoyAJVFLb
+LlDzITNBgOoC9ScN6ALjNB5P+vt1LweOM3TytQjlR+XdIu2xPDSmLL8SPPVl1Kca
+RETBER+K8r+hs8WVI4DQqCA+Cg+djmJdmnDvS3NLLJdkai+d0yCdWgPMkQ+nbxJx
+Qea+IMyJvT1S832puoQrVUfHj2/fpIKgkI6NavZUbmO2x+HMzKnqU72QI0TKFo4d
+bxt1ZbIaRink8SyhVfQD3DK1VQ2uZRLJKXb4eE/u2EXOtlIlHx9TWZLrs2Pzl5tV
+CwNPsPoJyAitNXBHJIuN3DwmuI0or2Xv5Yt3/6AScaPoSbENV4vA12gOq8a/QbOB
+nw4W3wJlrh7p3UW8zVpE
+=YByE
 -----END PGP SIGNATURE-----

diff --git a/app-text/qpdfview/qpdfview-0.4.13.ebuild b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
similarity index 91%
rename from app-text/qpdfview/qpdfview-0.4.13.ebuild
rename to app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
index 63d1effa61f3ddc19defc15d5b734f3f73a7b3ce..f188ac985fb1a4ad80e6792ad6158d97eb351a1b 100644 (file)
--- a/app-text/qpdfview/qpdfview-0.4.13.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13.ebuild,v 1.3 2015/02/10 06:26:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild,v 1.1 2015/03/05 13:48:24 yngwin Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RDEPEND="cups? ( net-print/cups )
        djvu? ( app-text/djvu )
        fitz? ( app-text/mupdf:0/1.4 )
        postscript? ( app-text/libspectre )
-       qt4? ( >=dev-qt/qtcore-4.8.6-r1:4[iconv]
+       qt4? ( dev-qt/qtcore:4[iconv]
                dev-qt/qtgui:4
                dbus? ( dev-qt/qtdbus:4 )
                pdf? ( app-text/poppler[qt4] )
@@ -47,8 +47,8 @@ DOCS=( CHANGES CONTRIBUTORS README TODO )
 src_prepare() {
        prepare_locale() {
                local _lrel
-               use qt4 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt4/bin/lrelease"
-               use qt5 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt5/bin/lrelease"
+               use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
+               use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
                ${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
        }
 

diff --git a/app-text/qpdfview/qpdfview-0.4.14.ebuild b/app-text/qpdfview/qpdfview-0.4.14.ebuild
index 53a4b3d807889194aea8f4a49e86fe0da1ea68fb..3098f9bd66117fbbb07ab2fe57b3218c8d41a215 100644 (file)
--- a/app-text/qpdfview/qpdfview-0.4.14.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v 1.1 2015/03/05 13:37:24 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v 1.2 2015/03/05 13:48:24 yngwin Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RDEPEND="cups? ( net-print/cups )
        djvu? ( app-text/djvu )
        fitz? ( app-text/mupdf:0/1.4 )
        postscript? ( app-text/libspectre )
-       qt4? ( >=dev-qt/qtcore-4.8.6-r1:4[iconv]
+       qt4? ( dev-qt/qtcore:4[iconv]
                dev-qt/qtgui:4
                dbus? ( dev-qt/qtdbus:4 )
                pdf? ( app-text/poppler[qt4] )
@@ -47,8 +47,8 @@ DOCS=( CHANGES CONTRIBUTORS README TODO )
 src_prepare() {
        prepare_locale() {
                local _lrel
-               use qt4 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt4/bin/lrelease"
-               use qt5 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt5/bin/lrelease"
+               use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
+               use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
                ${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
        }