From ce25be8cedf7fa2c9edcdde97548f09cc3851613 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Fri, 30 Jan 2015 21:06:11 +0000 Subject: [PATCH] Shorten pkg setup. Sort functions. Remove old. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xF3CFD2BD --- dev-libs/qtkeychain/ChangeLog | 8 ++- dev-libs/qtkeychain/Manifest | 32 +++++----- dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild | 70 --------------------- dev-libs/qtkeychain/qtkeychain-0.4.0.ebuild | 20 +++--- 4 files changed, 28 insertions(+), 102 deletions(-) delete mode 100644 dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild diff --git a/dev-libs/qtkeychain/ChangeLog b/dev-libs/qtkeychain/ChangeLog index 58951d3e8901..526aa7e1ba02 100644 --- a/dev-libs/qtkeychain/ChangeLog +++ b/dev-libs/qtkeychain/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/qtkeychain -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/ChangeLog,v 1.4 2014/09/19 17:55:22 johu Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/ChangeLog,v 1.5 2015/01/30 21:06:07 johu Exp $ + + 30 Jan 2015; Johannes Huber -qtkeychain-0.3.0.ebuild, + qtkeychain-0.4.0.ebuild: + Shorten pkg setup. Sort functions. Remove old. *qtkeychain-0.4.0 (19 Sep 2014) diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest index a684fac44573..9176d1908ee5 100644 --- a/dev-libs/qtkeychain/Manifest +++ b/dev-libs/qtkeychain/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qtkeychain-0.3.0.tar.gz 17659 SHA256 b796495c5c8aeedb1f0fb80f99b29e293c6e999b38f63a9a25fe53ae7281bc07 SHA512 7beb907c1d8eb1963c25c2bf402d859ec4ccd088b7ca68961cbd50877c1705243ecf86b4ac67fcf37ff06b51d8290ad0faf326b7834f6289ab43822c9745de73 WHIRLPOOL 5c147f8087aea1175157440c678ed506f543ba09f95c73a615bc9abb19558429533ecbd862ee753f664c64280f0af2fc47244063f529cbe54675c4032dfbeaad DIST qtkeychain-0.4.0.tar.gz 18236 SHA256 a67dea6a2cc857afdb12f1e639aef63d1a9841a44e5640d9e71d0446f146b707 SHA512 6dda0489193ed57d948e9426343972a186cde2c8503d0b72f64277ac202241ba710d61e30819e8f72f4bd500cfe2761179ec6be009d5e6f5fbe7bd1a3e65af8d WHIRLPOOL 44c636d48aaa577b79dc8f3838796f05e274a8c526d0923bb261ff8b2b361907b20eb0c6363713d77bc62ab0d6640f6bb423c033a25e937c35eece952f736410 -EBUILD qtkeychain-0.3.0.ebuild 1393 SHA256 1e2a966c11cb6df2d775817e773012d3d292e252bb529a90440f108cc608c3b9 SHA512 aa5a9bdddeda59a3d7e45351d2099f1f49ef82f2271752858465dc15656d5b3d5abc87ff0d8cbb6ef205700379c21c429b796f2404a0852d4166f7746b1f05e1 WHIRLPOOL 5156851cc20400414089938bb1e073dd0bf3dda47d5f514025a2402e5a5b05bd21a68c03811d6974b57ef796f53b388a14892fcc5a32e49b7bba77a55c0460e2 -EBUILD qtkeychain-0.4.0.ebuild 1393 SHA256 fdfae5886e9ca8f449745a3093deb7eea4b248ca3e3acf1c5ab6f5221233a4e8 SHA512 fabd0e39fa9f8b5dae9c6b602ea15a947d2cab94b3e8f202ef775aab5a85ba95e57133a2f06c3d5da38d46c06cf31f6943e373211b5babbdbf8d989aaf94a58b WHIRLPOOL e8aaacc0cab9e1bf8a0d23caee804d7946c3e1339574f415b0016b7976056e139099b3ec4ed1c47bf4c2c3e912fed7c92fc82b91df51085f37f100b15ceac945 -MISC ChangeLog 860 SHA256 3086ebd11c93bc605891e3ed956e47fdde9771ba8e31716404434b90fe6a1a8d SHA512 b65ea0ec82880c13fa7974ee706ffa8e80b1734a2595ee2299fd65ffc1828777dbbb9e55f4fe0ae0bb2dbc47513b1d4325ebd758a8268beb93d568375fcde634 WHIRLPOOL ac5186dc8531ecea4dd01441b241cc8f7dc32a8083eea86246f3b72a8921024d946b6cb91d407356c9251f27b70c14c03650bc8920327c32423bf5712c7af9ac +EBUILD qtkeychain-0.4.0.ebuild 1316 SHA256 23aef75867310bafb0abaef7a9eb0019761818ac3550aafbc8cf222c2dbeb8cc SHA512 64249f25fd5e083974f1c3606e769f01692111b5b18fdac418ef4510cf456c915dc54a082afe8d275da588ef23a874cc0d6435a3d27850842bce8883a4ec2afb WHIRLPOOL c0057a91da8a95f97e68cb6c49fc9b045e1f4f6dfe7a1b6452f0c87e1585deb5f47337a63102804b8a8e89368c76b2f4cda992bcfc8415bbb3743d64c51e6e56 +MISC ChangeLog 1011 SHA256 c6a8eb706f92a535d728c1e7a99967e8ceb4690d6fe798f8d1b21bc9fe79c48a SHA512 bf16a0f8c8465c09b0c0356bbd395427f984a3dd8512e9284dfd685796fa603aee8f992e5ba9c0e6f1bafa01782d3419fbb452fdb14c628f33a9a00e281d0435 WHIRLPOOL daf0d01bbbb93c0a51040aa7f75ebf06f99994581e02d88037a7ba3f9ee3fd5501bb6d0bb3e9311202cef19f14a62559f6c8f8a4e3580aa0c4ba5c9888e4179f MISC metadata.xml 231 SHA256 d67e9a26606c0a99afa1a19f7624e650f5909651c8c9dfc83f505bc086d2b639 SHA512 83ef26484c36d03fbe4599ba87dea62c8707f297459c1648939288031638d918cc387e5cd1888b637c33e39265e8e8445e3fdda3181e2da4edfa6f856ce40890 WHIRLPOOL 81245aa5fcda3c4070bb716707fbce2323bb75bb2eb5da0ccd13aac138c4a19da7eac1fbb204e09ef2ac0cefa7945099c494ef71bee262d6bd6ab95580963d1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUHG4PAAoJEGVpnaTzz9K9qp8QAJxXJEw3eS//uzjCF0ylwfMa -QTGZrOq1sLSM1450itdJKUc/B5lBr0kILwQ6mJT0zgtnTfHZBNwPhmgoM+m0zu+d -YRypPAXuWezdC9y8yga29AdUGwnjnNCoaQa7IlgqazPVkB6zgwNYsrAacE9gHR4F -bTPHzEY7//aSzuRm42Mv7ipZwxQAC0V2cXrUQjmOhyL7LFUnOP0Dwi2fyNvnPWsZ -rQ7sVfwfYY18AR3amHqsSZt6SOIdGnFYdpbo/84ge4/Uu6/XfdNlg3MqpKyz4vLA -ZI9lbjg4GPoUxuyA92d10L+AA+/TzaYGodlBytlVhwFeAo5PBSKEcwyjiPjqz+md -M1IiLX5KSiEicaZEkx0ejrChHXczZVwTR/u/BRnCv5mbF+sEHx21rzEFHz65Eafk -8MldEyo4kgVb49IDk6qYtNJMH/qkCrv6E1UIcpsnjRn1W0ZG//M9e/RYohP3MoaR -8P35MooJ/paJLrf1ZFOdnHL/JY7FUNfJXsReO6VmoCRhg/KMbVUMPUdGfCIxwsea -3tcjMR3nCOFNwZ2s5PZaCrCyjjoz9FQohiJb8B7AJouGJwvcnlFHcEdfhZWwxx09 -aS/O2KqxHC6tjYgV1pCVwdWvcqZH9jAdvDSAtaanESMl7edCFvnlcu7uc5YOLoTH -u/e4CwDhQ8ak+5+T9Ewc -=nevw +iQIcBAEBCAAGBQJUy/JAAAoJEGVpnaTzz9K9gsMQAI5CY3bA850Wv5YaWdthIJW5 +bpopMxFecfmvEVA3NwhWbpE7PjrY79ujXlOSURMkqN6YLYVCNAhuIJjIdR85hd9c +4BzDmGCeDQN0nh5dfy6mJrZ5BO4f/q/7ZbtZLbRctBUGGFhzQqXgbXcfULS7XBpY +0nm70OzvWPXpwYKBR6UYm2VE6cc7Wq3y4H/3XsoRokpM27HsIilR0dMRIl0yIJKk +Zr/DrCEwMRowqB7GDHTUch/e078rVNJA7qHdKok501SNypcC2gL/8CqeHNUN6Z4m +vyYe/wJPKbFlDmNV7dqeVvpW2G4tnovK5j7mRselX3Lfz3PNTOt4Nga4O1ESns+X +HlwEoSEpJRL1KkxBfGpBioSJXde8WsRIZXP/EAdG5yW8pk9ysBTaRTH9ZOFz46Go +N4NIBuwHZXKUUb5gFd6Y9n/H7ySphTtsSKhjVR5++CVCUl4zCApueKWkVeGjZGNt +OxtKuKy1M931llT/w58m5MyPTQFKnh4qZuvZkdFSrZT5Z+dddcdWClxRZCtQKAZK +RQNQq04FiIAXFhyshc9FwNMAAqLujriRnZ4ZH9nT3rpIgTQNRkKfh6je9kgYdmZC +9XSsxur5/RxlPgRs3dHqRTMxKuaMxsdAg16wvIXAuDvTpzU3MHyiy5IUAq1jihn6 +EbPWAse2BpYxLw/8Ffoa +=k8EG -----END PGP SIGNATURE----- diff --git a/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild deleted file mode 100644 index 5af1bb894b12..000000000000 --- a/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild,v 1.2 2014/04/17 20:07:32 johu Exp $ - -EAPI=5 - -inherit cmake-utils multibuild - -DESCRIPTION="Qt API for storing passwords securely" -HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" -SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+qt4 qt5" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - ) -" -DEPEND="${RDEPEND} - qt5? ( dev-qt/linguist-tools:5 ) -" - -DOCS=( ChangeLog ReadMe.txt ) - -pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi -} - -src_configure() { - myconfigure() { - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - local mycmakeargs=(-DBUILD_WITH_QT4=ON) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - local mycmakeargs=(-DBUILD_WITH_QT4=OFF) - fi - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} diff --git a/dev-libs/qtkeychain/qtkeychain-0.4.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.4.0.ebuild index 47807353f8a9..3235232d6186 100644 --- a/dev-libs/qtkeychain/qtkeychain-0.4.0.ebuild +++ b/dev-libs/qtkeychain/qtkeychain-0.4.0.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/dev-libs/qtkeychain/qtkeychain-0.4.0.ebuild,v 1.1 2014/09/19 17:55:22 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.4.0.ebuild,v 1.2 2015/01/30 21:06:07 johu Exp $ EAPI=5 @@ -34,13 +34,7 @@ DEPEND="${RDEPEND} DOCS=( ChangeLog ReadMe.txt ) pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } src_configure() { @@ -61,10 +55,10 @@ src_compile() { multibuild_foreach_variant cmake-utils_src_compile } -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} - src_test() { multibuild_foreach_variant cmake-utils_src_test } + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} -- 2.26.2