From 4a0673c1a5afeb9770081121d698844488369984 Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Sun, 1 Apr 2007 16:23:33 +0000 Subject: [PATCH] Fix bug #142458, bug #157209, desktop entry location. Package-Manager: portage-2.1.2.3 --- kde-misc/pwmanager/ChangeLog | 8 +++- kde-misc/pwmanager/Manifest | 30 +++++-------- .../pwmanager/files/digest-pwmanager-1.2.3 | 3 -- ...anager-1.2.4 => digest-pwmanager-1.2.4-r1} | 0 kde-misc/pwmanager/pwmanager-1.2.3.ebuild | 44 ------------------- ...1.2.4.ebuild => pwmanager-1.2.4-r1.ebuild} | 44 +++++++------------ 6 files changed, 35 insertions(+), 94 deletions(-) delete mode 100644 kde-misc/pwmanager/files/digest-pwmanager-1.2.3 rename kde-misc/pwmanager/files/{digest-pwmanager-1.2.4 => digest-pwmanager-1.2.4-r1} (100%) delete mode 100644 kde-misc/pwmanager/pwmanager-1.2.3.ebuild rename kde-misc/pwmanager/{pwmanager-1.2.4.ebuild => pwmanager-1.2.4-r1.ebuild} (60%) diff --git a/kde-misc/pwmanager/ChangeLog b/kde-misc/pwmanager/ChangeLog index 95ac27a99721..73ae34cb1a32 100644 --- a/kde-misc/pwmanager/ChangeLog +++ b/kde-misc/pwmanager/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-misc/pwmanager # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/ChangeLog,v 1.9 2007/02/22 00:52:23 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/ChangeLog,v 1.10 2007/04/01 16:23:33 carlo Exp $ + +*pwmanager-1.2.4-r1 (01 Apr 2007) + + 01 Apr 2007; Carsten Lohrke -pwmanager-1.2.3.ebuild, + -pwmanager-1.2.4.ebuild, +pwmanager-1.2.4-r1.ebuild: + Fix bug #142458, bug #157209, desktop entry location. 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/kde-misc/pwmanager/Manifest b/kde-misc/pwmanager/Manifest index f417eaefedc2..e77efc03bea0 100644 --- a/kde-misc/pwmanager/Manifest +++ b/kde-misc/pwmanager/Manifest @@ -1,25 +1,17 @@ -DIST pwmanager-1.2.3.tar.bz2 577130 RMD160 2499974b606e235348469a5ad1d9af8afc03cb46 SHA1 cb71f1719c1dce1b6946f504fd7eb8bcb43f353e SHA256 4888ae69330341746abb850d8d12cf1a229f8777b426515864d0fe9caccf23ea DIST pwmanager-1.2.4.tar.bz2 581740 RMD160 21c5339574fbdaaa644758fc80b21b1fd12e2ee8 SHA1 c6365746d78870fca5ad64fdbc97598caa13f856 SHA256 537957228ccd36bb3be3191d1c611fdc44b1b047730d986089914e87c78cb6a0 DIST pwmanager-i18n-1.2.4.tar.bz2 502200 RMD160 05d1908dde6c94f3f883c501152042b2ba39d698 SHA1 2d017c72387778c4ae8b7af071c77dac521e2d0e SHA256 97fdd6c6b3f9d0729cbfe769a040c8a99fd96fcc9cf4819805dda5274295932f -EBUILD pwmanager-1.2.3.ebuild 1144 RMD160 26bf35fcb38a52ebb09a4166ba131ad9259da92d SHA1 069eeb4def545872c8ff6814aa577158a00664e9 SHA256 0654382ce41b5c5646d95476e05443629eb250a42ab35d76f11086bfdc318217 -MD5 b810adc453553f577f375f34b436b1ff pwmanager-1.2.3.ebuild 1144 -RMD160 26bf35fcb38a52ebb09a4166ba131ad9259da92d pwmanager-1.2.3.ebuild 1144 -SHA256 0654382ce41b5c5646d95476e05443629eb250a42ab35d76f11086bfdc318217 pwmanager-1.2.3.ebuild 1144 -EBUILD pwmanager-1.2.4.ebuild 1808 RMD160 013dd4c291888196a10205b27ecb04330e10391a SHA1 51ffe708e7eb3688d46f24e857ebe7fffb80f486 SHA256 fa03a6c84ca151c55f3c7ba55f6dcb5f6161da6c2851f1e2f4e0fc10d5a192f7 -MD5 3115b938545c1d3406fce147a201db6c pwmanager-1.2.4.ebuild 1808 -RMD160 013dd4c291888196a10205b27ecb04330e10391a pwmanager-1.2.4.ebuild 1808 -SHA256 fa03a6c84ca151c55f3c7ba55f6dcb5f6161da6c2851f1e2f4e0fc10d5a192f7 pwmanager-1.2.4.ebuild 1808 -MISC ChangeLog 1324 RMD160 a29979f3ec1702d55575f2fda05b1fd630b2cf49 SHA1 f5df618f5a80797cf08e4026763480609ef3d21a SHA256 1f7a2429863b20982bedf3ec9d587dd667e9101c5f36b8f46a7fa6f083dd2d8e -MD5 b3b339b04a534608c3c9d1e02b8347db ChangeLog 1324 -RMD160 a29979f3ec1702d55575f2fda05b1fd630b2cf49 ChangeLog 1324 -SHA256 1f7a2429863b20982bedf3ec9d587dd667e9101c5f36b8f46a7fa6f083dd2d8e ChangeLog 1324 +EBUILD pwmanager-1.2.4-r1.ebuild 1641 RMD160 7e0c1d821a5f313ef052a5b0d7b361bbfe484d1e SHA1 05f283a8330391c576f59a77b130b86dcdd6602a SHA256 2e7addd776a18f397787dba4a3efa72e3cf51a97b6f64fa72c520f356d6e024b +MD5 a3cdb7dc20acfad59df26dbf101328da pwmanager-1.2.4-r1.ebuild 1641 +RMD160 7e0c1d821a5f313ef052a5b0d7b361bbfe484d1e pwmanager-1.2.4-r1.ebuild 1641 +SHA256 2e7addd776a18f397787dba4a3efa72e3cf51a97b6f64fa72c520f356d6e024b pwmanager-1.2.4-r1.ebuild 1641 +MISC ChangeLog 1546 RMD160 4ca45c8036f8171ad88a380f1dfaf1ff88e69f3c SHA1 629bf4d3cf6715decda1c9880aed37ad7133480c SHA256 719069bb1736d6c6ac884e31e3ff79aa2afdf3fc4d2df24cb387659d5b5b8c0e +MD5 bc9669e7d37bdb6bf92e7d966a3201ab ChangeLog 1546 +RMD160 4ca45c8036f8171ad88a380f1dfaf1ff88e69f3c ChangeLog 1546 +SHA256 719069bb1736d6c6ac884e31e3ff79aa2afdf3fc4d2df24cb387659d5b5b8c0e ChangeLog 1546 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156 -MD5 6f9c20a6ff06af8ce53713dc13b0022f files/digest-pwmanager-1.2.3 250 -RMD160 fb7e3c99188ddf4f89426f3cf995d59b9550aeec files/digest-pwmanager-1.2.3 250 -SHA256 f9b21be34379940559ebcc9308c13ef21626d3d1497009225a02de5aaec4356d files/digest-pwmanager-1.2.3 250 -MD5 4ef7a677aba38b5e710a91869063f2ee files/digest-pwmanager-1.2.4 515 -RMD160 17bf4481f2be0d5a9a11c56e79d38f20d493e12b files/digest-pwmanager-1.2.4 515 -SHA256 c4a312e07fa50ed03c12810d5eb6e56c4bb4dbd3773a7896c3bc6890867951eb files/digest-pwmanager-1.2.4 515 +MD5 4ef7a677aba38b5e710a91869063f2ee files/digest-pwmanager-1.2.4-r1 515 +RMD160 17bf4481f2be0d5a9a11c56e79d38f20d493e12b files/digest-pwmanager-1.2.4-r1 515 +SHA256 c4a312e07fa50ed03c12810d5eb6e56c4bb4dbd3773a7896c3bc6890867951eb files/digest-pwmanager-1.2.4-r1 515 diff --git a/kde-misc/pwmanager/files/digest-pwmanager-1.2.3 b/kde-misc/pwmanager/files/digest-pwmanager-1.2.3 deleted file mode 100644 index a7481b7d0733..000000000000 --- a/kde-misc/pwmanager/files/digest-pwmanager-1.2.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f21377b5270fa946372e9a67d5ec892e pwmanager-1.2.3.tar.bz2 577130 -RMD160 2499974b606e235348469a5ad1d9af8afc03cb46 pwmanager-1.2.3.tar.bz2 577130 -SHA256 4888ae69330341746abb850d8d12cf1a229f8777b426515864d0fe9caccf23ea pwmanager-1.2.3.tar.bz2 577130 diff --git a/kde-misc/pwmanager/files/digest-pwmanager-1.2.4 b/kde-misc/pwmanager/files/digest-pwmanager-1.2.4-r1 similarity index 100% rename from kde-misc/pwmanager/files/digest-pwmanager-1.2.4 rename to kde-misc/pwmanager/files/digest-pwmanager-1.2.4-r1 diff --git a/kde-misc/pwmanager/pwmanager-1.2.3.ebuild b/kde-misc/pwmanager/pwmanager-1.2.3.ebuild deleted file mode 100644 index 1eaaa3f5a9ff..000000000000 --- a/kde-misc/pwmanager/pwmanager-1.2.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/pwmanager-1.2.3.ebuild,v 1.4 2005/08/20 17:11:38 greg_g Exp $ - -inherit kde - -DESCRIPTION="Password manager for KDE supporting chipcard access and encryption." -HOMEPAGE="http://passwordmanager.sourceforge.net" -SRC_URI="mirror://sourceforge/passwordmanager/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="smartcard" - -DEPEND="smartcard? ( sys-libs/libchipcard ) - sys-libs/zlib - app-arch/bzip2" - -need-kde 3.3 - -src_compile() { - local myconf="--enable-kwallet" - - if use smartcard; then - myconf="${myconf} --enable-pwmanager-smartcard" - - if has_version "=sys-libs/libchipcard-0.9*"; then - myconf="${myconf} --enable-pwmanager-libchipcard1" - else - myconf="${myconf} --disable-pwmanager-libchipcard1" - fi - - if has_version ">=sys-libs/libchipcard-1.9"; then - myconf="${myconf} --enable-pwmanager-libchipcard2" - else - myconf="${myconf} --disable-pwmanager-libchipcard2" - fi - else - myconf="${myconf} --disable-pwmanager-smartcard" - fi - - kde_src_compile -} diff --git a/kde-misc/pwmanager/pwmanager-1.2.4.ebuild b/kde-misc/pwmanager/pwmanager-1.2.4-r1.ebuild similarity index 60% rename from kde-misc/pwmanager/pwmanager-1.2.4.ebuild rename to kde-misc/pwmanager/pwmanager-1.2.4-r1.ebuild index 63450e64653f..6a3d166eb816 100644 --- a/kde-misc/pwmanager/pwmanager-1.2.4.ebuild +++ b/kde-misc/pwmanager/pwmanager-1.2.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/pwmanager-1.2.4.ebuild,v 1.4 2006/06/16 12:12:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/pwmanager-1.2.4-r1.ebuild,v 1.1 2007/04/01 16:23:33 carlo Exp $ inherit kde @@ -10,14 +10,14 @@ SRC_URI="mirror://sourceforge/passwordmanager/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="smartcard" -DEPEND="smartcard? ( sys-libs/libchipcard ) +DEPEND="smartcard? ( >=sys-libs/libchipcard-1.9 ) sys-libs/zlib app-arch/bzip2" -need-kde 3.3 +need-kde 3.5 LANGS_PKG=${PN}-i18n-${PV} LANGS="ca da de el es et fr hu it lt nl pl ro sv" @@ -31,30 +31,17 @@ src_compile() { local myconf="--enable-kwallet" if use smartcard; then - myconf="${myconf} --enable-pwmanager-smartcard" - - if has_version "=sys-libs/libchipcard-0.9*"; then - myconf="${myconf} --enable-pwmanager-libchipcard1" - else - myconf="${myconf} --disable-pwmanager-libchipcard1" - fi - - if has_version ">=sys-libs/libchipcard-1.9"; then - myconf="${myconf} --enable-pwmanager-libchipcard2" - else - myconf="${myconf} --disable-pwmanager-libchipcard2" - fi + myconf="${myconf} --enable-pwmanager-smartcard \ + --disable-pwmanager-libchipcard1 \ + --enable-pwmanager-libchipcard2" else myconf="${myconf} --disable-pwmanager-smartcard" fi kde_src_compile - local _S="${S}" if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then - S="${WORKDIR}/${LANGS_PKG}" - cd "${S}" - + KDE_S="${WORKDIR}/${LANGS_PKG}" for X in ${LANGS}; do use linguas_${X} || DO_NOT_COMPILE="${DO_NOT_COMPILE} ${X}" done @@ -62,17 +49,20 @@ src_compile() { kde_src_compile fi - S="${_S}" } src_install() { + KDE_S="" kde_src_install - local _S="${S}" if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then - S="${WORKDIR}/${LANGS_PKG}" - cd "${S}" + KDE_S="${WORKDIR}/${LANGS_PKG}" kde_src_install fi - S="${_S}" } + +pkg_preinst() { + kde_pkg_preinst + dodir /usr/share/applications/kde/ + mv ${D}/usr/share/applnk/Applications/pwmanager.desktop ${D}/usr/share/applications/kde/ +} \ No newline at end of file -- 2.26.2