Fix bug #142458, bug #157209, desktop entry location.

(Portage version: 2.1.2.3)

5 files changed, 24 insertions, 75 deletions

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 <carlo@gentoo.org> -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 <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
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
index a1abe2d1e609..a1abe2d1e609 100644
--- a/kde-misc/pwmanager/files/digest-pwmanager-1.2.4
+++ b/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
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