GCC 4.3 compatibily, see bug #225451. Desktop entry standard compliance and getting rid of the arts use flag.

Package-Manager: portage-2.1.4.4

5 files changed, 133 insertions, 3 deletions

diff --git a/kde-misc/pwmanager/ChangeLog b/kde-misc/pwmanager/ChangeLog
index 7d636e484aec..9cd5869e154a 100644
--- a/kde-misc/pwmanager/ChangeLog
+++ b/kde-misc/pwmanager/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2007/11/16 14:45:32 beandog Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/ChangeLog,v 1.17 2008/06/09 01:08:46 carlo Exp $
+
+*pwmanager-1.2.4-r3 (09 Jun 2008)
+
+  09 Jun 2008; Carsten Lohrke <carlo@gentoo.org>
+  +files/pwmanager-1.2.4-desktop-entry.diff,
+  +files/pwmanager-1.2.4-gcc43.patch, +pwmanager-1.2.4-r3.ebuild:
+  GCC 4.3 compatibily, see bug #225451. Desktop entry standard compliance and
+  getting rid of the arts use flag.
 
   16 Nov 2007; Steve Dibb <beandog@gentoo.org> pwmanager-1.2.4-r2.ebuild:
   amd64 stable, bug 192840
diff --git a/kde-misc/pwmanager/Manifest b/kde-misc/pwmanager/Manifest
index 275edb981857..9ae9d597f54e 100644
--- a/kde-misc/pwmanager/Manifest
+++ b/kde-misc/pwmanager/Manifest
@@ -1,6 +1,9 @@
+AUX pwmanager-1.2.4-desktop-entry.diff 685 RMD160 4d491f71a45acfe6ad0b817349416a17835bc19e SHA1 d69baeee5317efaa1d22fb65076d4007482f732f SHA256 b45116361d53501f988290934d62798f1272242d497e347b92585262fef99298
+AUX pwmanager-1.2.4-gcc43.patch 1144 RMD160 2f0c94592d8852b74dc9c13e55f387ca4284731d SHA1 3833e05cf68ee00d39072811f2a4df0d5f2ab10a SHA256 8bd28b62e200f2c557505784e280402328edcde6591019ba499067da500060a2
 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.4-r1.ebuild 1477 RMD160 41672ab45f940c3e7b470beb87d9667efc77df20 SHA1 2c31be7f3c8e0b18ebf80913a51fa7a24244b72d SHA256 d8a4dc198f396894e29c0cb5f30b188873c49ec15282f31e838dc96e9c526c1c
 EBUILD pwmanager-1.2.4-r2.ebuild 1235 RMD160 480ef210e1ef7c246ba705fb17d707ee411f5253 SHA1 607bf7ce1501dc6253dea276e7a7dd6e7183560d SHA256 ad02bfc4624915e1b95895d7421e3b018820f174bcea55e059b4c9e3e6762fcc
-MISC ChangeLog 2311 RMD160 115007e9af514c26e57c208657ddf129e6113c1e SHA1 00377bda16c765395c4a017f343b2e1c554c7ed9 SHA256 dd7c743f3e6084373e990cdc95366856955cdee9ee567f0f4b1d872520c5cc44
+EBUILD pwmanager-1.2.4-r3.ebuild 1335 RMD160 b007c5844b6ff7e1da18624293bb0a05b60a4ef1 SHA1 872397f423342cb4f1ca62d2d342288202f4d3c5 SHA256 08a39c21bed183233f1da5ccc4eb9b9e56216ab7a55ff6b0bf24343827accbec
+MISC ChangeLog 2619 RMD160 907f4e21937110068f481741579acc9416efc81f SHA1 b3bde8d9e203ea5adbc6e09c4475110172b5a13b SHA256 4418e283a994e83bdd551c845ebded5d1832bd2f6af1ec28a754a4cdde1f7ade
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/pwmanager/files/pwmanager-1.2.4-desktop-entry.diff b/kde-misc/pwmanager/files/pwmanager-1.2.4-desktop-entry.diff
new file mode 100644
index 000000000000..2022cbff2b6e
--- /dev/null
+++ b/kde-misc/pwmanager/files/pwmanager-1.2.4-desktop-entry.diff
@@ -0,0 +1,20 @@
+--- ./pwmanager/pwmanager.desktop.orig	2008-06-09 01:56:40.000000000 +0200
++++ ./pwmanager/pwmanager.desktop	2008-06-09 01:56:54.000000000 +0200
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+-Exec=pwmanager -caption "%c" %i %m
++Exec=pwmanager -caption "%c" %i
+ Icon=pwmanager
+ Comment=The convenient way of managing passwords
+ Comment[da]=Den bekvemme måde at håndtere kodeord på
+--- pwmanager/Makefile.am.orig	2008-06-09 02:06:33.000000000 +0200
++++ pwmanager/Makefile.am	2008-06-09 02:07:00.000000000 +0200
+@@ -125,5 +125,5 @@
+ 
+ KDE_ICON = pwmanager
+ 
+-kdelnkdir   = $(kde_appsdir)/Applications
++kdelnkdir   = $(xdg_appsdir)
+ kdelnk_DATA = pwmanager.desktop
diff --git a/kde-misc/pwmanager/files/pwmanager-1.2.4-gcc43.patch b/kde-misc/pwmanager/files/pwmanager-1.2.4-gcc43.patch
new file mode 100644
index 000000000000..7e453eb3645d
--- /dev/null
+++ b/kde-misc/pwmanager/files/pwmanager-1.2.4-gcc43.patch
@@ -0,0 +1,43 @@
+--- pwmanager/serializer.h.orig	2008-06-08 23:31:18.000000000 +0200
++++ pwmanager/serializer.h	2008-06-08 23:31:57.000000000 +0200
+@@ -16,6 +16,8 @@
+ 
+ #include <qcstring.h>
+ #include <qdom.h>
++#include <cstdlib>
++
+ 
+ #include <vector>
+ 
+--- pwmanager/main.cpp.orig	2008-06-08 23:34:59.000000000 +0200
++++ pwmanager/main.cpp	2008-06-08 23:35:22.000000000 +0200
+@@ -9,6 +9,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <cstdlib>
+ #include <kcmdlineargs.h>
+ #include <kaboutdata.h>
+ #include <klocale.h>
+
+--- pwmanager/base64.h.orig	2008-06-08 23:38:32.000000000 +0200
++++ pwmanager/base64.h	2008-06-08 23:38:51.000000000 +0200
+@@ -44,6 +44,7 @@
+ #ifndef __BASE64_H
+ #define __BASE64_H
+ 
++#include <cstdlib>
+ #include <string>
+ 
+ using std::string;
+
+--- pwmanager/compressbzip2.h.orig	2008-06-08 23:42:08.000000000 +0200
++++ pwmanager/compressbzip2.h	2008-06-08 23:42:24.000000000 +0200
+@@ -12,6 +12,7 @@
+ #ifndef COMPRESSBZIP2_H
+ #define COMPRESSBZIP2_H
+ 
++#include <cstring>
+ #include <string>
+ using std::string;
+ 
diff --git a/kde-misc/pwmanager/pwmanager-1.2.4-r3.ebuild b/kde-misc/pwmanager/pwmanager-1.2.4-r3.ebuild
new file mode 100644
index 000000000000..fe1fd123348e
--- /dev/null
+++ b/kde-misc/pwmanager/pwmanager-1.2.4-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/06/09 01:08:46 carlo Exp $
+
+
+ARTS_REQUIRED="never"
+
+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=""
+
+need-kde 3.5
+
+LANGS_PKG=${PN}-i18n-${PV}
+LANGS="ca da de el es et fr hu it lt nl pl ro sv"
+
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/passwordmanager/${LANGS_PKG}.tar.bz2 )"
+	IUSE="${IUSE} linguas_${X}"
+done
+
+PATCHES=( "${FILESDIR}/pwmanager-1.2.4-gcc43.patch"
+		"${FILESDIR}/pwmanager-1.2.4-desktop-entry.diff" )
+
+src_compile() {
+	local myconf="--enable-kwallet --disable-pwmanager-smartcard"
+
+	kde_src_compile
+
+	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
+		KDE_S="${WORKDIR}/${LANGS_PKG}"
+		for X in ${LANGS}; do
+			use linguas_${X} || DO_NOT_COMPILE="${DO_NOT_COMPILE} ${X}"
+		done
+		export DO_NOT_COMPILE
+
+		kde_src_compile
+	fi
+}
+
+src_install() {
+	KDE_S=""
+	kde_src_install
+
+	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
+		KDE_S="${WORKDIR}/${LANGS_PKG}"
+		kde_src_install
+	fi
+}