Ebuild improvements contributed bby Nikoli: more precise deps, and epatch_user support

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

diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index 88db1b0638b6d2dcceacd86fd240e917656a2e42..ab6b11af3e2d235bc2e156ee9fb38bf1ee70dd3a 100644 (file)
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/qupzilla
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.55 2015/03/04 17:17:56 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.56 2015/03/29 12:35:42 yngwin Exp $
+
+  29 Mar 2015; Ben de Groot <yngwin@gentoo.org> qupzilla-1.8.6.ebuild:
+  Ebuild improvements contributed bby Nikoli: more precise deps, and epatch_user
+  support
 
   04 Mar 2015; Michael Palimaka <kensington@gentoo.org> -qupzilla-1.8.4.ebuild,
   -qupzilla-1.8.5.ebuild:

diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 43414d4d87173fec86287064f171c4f9f3a1da1f..99e367fd9350ea094831b51160a4dec5ae8d7e9b 100644 (file)
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -3,24 +3,25 @@ Hash: SHA256
 
 DIST QupZilla-1.8.6.tar.xz 3205912 SHA256 aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5 SHA512 36f1c79b7932b76f3ecbc4d1ea1bb207fe7e0477a98d583e13ab7df1703a5529e2d599c42b8f0a6792692c09e257abfdec398a1537a9002c1fd98d2128f4b627 WHIRLPOOL e60f66749654bd135fa2552ed2d75095c00108be6992b5d0e1609d7b458690218e601af317b3219f6e106e19870e46207109659e8aa9182117532bda7481f8e3
 DIST qupzilla-plugins-2015.01.27.tar.gz 335585 SHA256 466d2cc4a0b904705e2d23b6c05be6d36c74065f81b24aa9b82be0e377960e55 SHA512 0354b96530eca72d27838acfcd6605c0a14095f741587b89d1d4292e57bebe54d17e49464dc0a41af99873031c69ef09120c07053452568caf16dca222f1371b WHIRLPOOL a849f120f7f7a9e4dae6fa9abb2d3a66295a4778101887e99248f1ebd46e9231481f99f1d8fd9478e12f5cedbc5be055948ebe026d504d6b5d2d362ee222ba49
-EBUILD qupzilla-1.8.6.ebuild 3021 SHA256 e284754bfb6deae09fde25a200e865a749669c209426d8297ed0f38fb0f9ad1d SHA512 b7fa6107345164541c1dc338a6f1ddd9e020ca5d1952cd56a2e04b24c9e90ab325ad440689a96650ff2e31e22ebf06fc716d96944e9d55ca190049782adcd7ac WHIRLPOOL 5a9540c546700b92f7a13b497dfde4fb262bcd4dbd11761b63b9f82e29529f71434602a5a4f616af979abfe02c00e9d81318c6aa5d58d769dcf53e8a117458cd
-MISC ChangeLog 8438 SHA256 5a9effd51e35751d831989bb1d196f68ebde4c3c502d78231d0df94ffd9bbe79 SHA512 1903c26bce2bebc96819a0a80acbb7bacbbb31afd954f6580f9abc6d4422a470ad1666164cae0d49a85e021c1e252063449e75ef7085adebb86ef9859d2f5deb WHIRLPOOL dae4bf5864d068cb25b2d00bcfab6b9c02f70c8de9c6f8c349980f7c05bb1a5fb86aef830b6afe122e4b413d292a2ff00b8ced3f8848936cc4c0c3fc0fa61ae2
+EBUILD qupzilla-1.8.6.ebuild 3090 SHA256 102ad67beb707e0adf4ca755bbb3493c7ae74400c26053d76ab1e3aa617702ef SHA512 8d09d61a19d77a00ec32605b740c5010dac1529603c787423c363b49c6f8e668bd2fe35d09bea82238b8330f07722e0fb0b6cc1ad9700e4b39534d5a3666dafb WHIRLPOOL 2b76f63f56bd12a5550f098911ec3e4b0bb40eeb01266aa5bec1d441a9db062e5b4ef0b8e9d46eed796ef6a7e9487e46bcd0db6299f688ba08e9d41980134bd5
+MISC ChangeLog 8597 SHA256 9daba49bc86af74559270a79fc93ddf9692da502f7fce059dd163585d7f613e2 SHA512 1a713a26636acbaac7ebdc2a8ccaa05346276225b2e149f1b83c18e22ba334788422de89f66a659cb2fa2019c6bcc6893f6a59931eae812d09b78b5c83cb8434 WHIRLPOOL 4d2be5e625c5111cd1559d32e38795900cc0813e1f44202010958ce5e45c980790c921b3b37dbe87ee75b591b85546f652564650cde7b2f607e10089b89b2832
 MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJU9z5RRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7NVKD/0fRD1rsy+vyAWaisFfMvLs3C3qjo9xOh938bwDXnm8Oe0TeH/tt/wopYmZ
-fdkzsrsVjw7SXIqf1rvIKgOkMXshX0GYVIcyy0sb217VUMKAGhOliHoFATcuPmc6
-bLdWpkqcxjzjHqVpWAFbE+GXBoMttHVso1jSk80H3VLskdO2u6BFww/z5n3NIPA8
-mMfdk2uJ04/7rmQp5gN08uAlJCPduvLIBNSPlYTVk4g7WCRKLin2UrjVjXvqSfiY
-m+QXo0Wb4c/TbboSacL/rVxUH4vwn1dJV6Qt8Zb4iexiNCmLY07KwmMbu6Nl8OpT
-Ov/7txmy3txR26sqLZ34BJzYMuvScpIlHQGUWqNaYa5IpYzTlWbfFhRHQjrocvo8
-wS+3H5aoqh96fYSSyi7bJ5DCZbXb6VRMxLE1392NukKKkvfmKcnxbG6rUfCAmPhR
-Wt4cCYKAqaQUB3MwnvNlsfS5zOs16DVTH/ANYaylozux8C1gNP2P7b6ofrVGi1RB
-26T0PfPk5sqb6VMk8oWx9A40QcskKQ/V9L52K9ZjYIFanOEh2OMgkhExn6V194fw
-fJfxHJ7gykchjoib4vH+rEFcxDUpSJpq8yipbPUzsNyNBIcjnBHvgAk5ksYTPHvT
-XxuB+Hm1tojd4+jgHKrv4fB0DiD+/Yerp32O3jWthQHTKV0GFQ==
-=iymQ
+iQJ8BAEBCABmBQJVF/GjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOj5kQALsTEXwMIF6W4HH2Pk0AdUib
+2uI6G6V72uz8R5FUUSFlqxfHoCxTKUm0xdn2ddgaXJvEFQFgqytix82wynnCVFIs
+yHdz9S4Q8kFVlT5bg5IKoRlultH78QyCEFgBfYfKHOUiqINk7WNSVZzXxNmYhL2G
+DDryOfojBJ0dDBdBb60TNxCaH0QBpuGpu9bB1NiCne7WUFkiyO4ZP9kzyvzs2dyH
+vWi0JH6/HhvS4Mc0Y+zZ5e3umvUPZEBB747VqKNhogeSQRrPCuk5ZZu5VnJgYp8o
+1/tpLS1BjqXm85mURCYZ4jvIeLAZFwmkPM0+9rOZZvQTBK2My69vayMDN09l4AH9
+OpUqZ3hGXYLWlNK2DQy/HuMLP8Etbm/PhL1ywPjjEw7AFe5z8TjR9Vbo0nD5pMPa
+PGLa+3zAplzFe3thXSCi2AhqawBtMvpMngsWnsr5c1X5dklgC0LP3ENdfA/2vt2i
+01hmqyZWBhPuXl2Jb3flFrrHEoUXyjfW3Ii2cDV5tToY9+m6GiXZYyHjbxmIPL5Q
+T6KPrQDp8eHXfodp7QpcNtz1rSuSdVopImPy+NDR2jVe/D7JMDlwNbgfc5InZeRA
+ywxjk+lVP6x8xBfDHcn2gsUh5tYn7aKdWKPxKqXpo/PeOLxMvqXFxCzVZvqm/Ujm
+Pz4Hl84D075OasVJX2ew
+=8wEl
 -----END PGP SIGNATURE-----

diff --git a/www-client/qupzilla/qupzilla-1.8.6.ebuild b/www-client/qupzilla/qupzilla-1.8.6.ebuild
index 8d32e6eacffbca9c7a2e19d3c6b202eecfef9ff8..a52615c1fc3f45563aac1979d8f4064e06010263 100644 (file)
--- a/www-client/qupzilla/qupzilla-1.8.6.ebuild
+++ b/www-client/qupzilla/qupzilla-1.8.6.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/www-client/qupzilla/qupzilla-1.8.6.ebuild,v 1.3 2015/02/25 16:01:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.8.6.ebuild,v 1.4 2015/03/29 12:35:42 yngwin Exp $
 
 EAPI=5
 MY_PN="QupZilla"
@@ -20,11 +20,14 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
+REQUIRED_USE="^^ ( qt4 qt5 )
+       kde? ( qt4 )"
 
 RDEPEND="dev-libs/openssl:0
+       x11-libs/libX11
        gnome-keyring? ( gnome-base/gnome-keyring )
-       kde? ( kde-base/kwalletd:4 )
+       kde? ( kde-base/kdelibs:4
+               kde-base/kwalletd:4 )
        qt4? ( >=dev-qt/qtcore-4.8:4
                >=dev-qt/qtgui-4.8:4
                >=dev-qt/qtscript-4.8:4
@@ -53,6 +56,8 @@ src_prepare() {
                rm translations/${1}.ts || die
        }
 
+       epatch_user
+
        # remove outdated prebuilt localizations
        rm -rf bin/locale || die