Fixed bug #139327; commit approved by tantive

Package-Manager: portage-2.1.1

5 files changed, 68 insertions, 15 deletions

diff --git a/net-misc/kovpn/ChangeLog b/net-misc/kovpn/ChangeLog
index 6f7800d0daab..c259b8856859 100644
--- a/net-misc/kovpn/ChangeLog
+++ b/net-misc/kovpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/kovpn
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kovpn/ChangeLog,v 1.4 2006/07/02 21:43:06 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kovpn/ChangeLog,v 1.5 2006/09/14 09:45:14 ian Exp $
+
+*kovpn-0.3_pre6-r1 (14 Sep 2006)
+
+  14 Sep 2006; Christian Hartmann <ian@gentoo.org>
+  +files/traywindow_x86_64.patch, +kovpn-0.3_pre6-r1.ebuild:
+  Fixed bug #139327; commit approved by tantive
 
 *kovpn-0.3_pre6 (02 Jul 2006)
 
diff --git a/net-misc/kovpn/Manifest b/net-misc/kovpn/Manifest
index 1ed13f246ed2..9f4dadf95b72 100644
--- a/net-misc/kovpn/Manifest
+++ b/net-misc/kovpn/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX traywindow_x86_64.patch 941 RMD160 39d3371a012312b740b693481379d4661dc8d36f SHA1 0a53867863f35bdc03a6a5f51e523483b52a2f56 SHA256 4a37bfcb1643839141b9dfe6c708ef4e801bcd147aa6f704705ee130699d3feb
+MD5 bf6218bf2686b6fe41874d5df4e71d63 files/traywindow_x86_64.patch 941
+RMD160 39d3371a012312b740b693481379d4661dc8d36f files/traywindow_x86_64.patch 941
+SHA256 4a37bfcb1643839141b9dfe6c708ef4e801bcd147aa6f704705ee130699d3feb files/traywindow_x86_64.patch 941
 DIST kovpn-0.2.tar.bz2 487299 RMD160 ebce39199a7b26b510e8cb30b5770e01fe4ccf09 SHA1 d6c2ccc88bc2183c3c1c5765dd319f9485d68233 SHA256 a32e3d9e8564ce293e8f3acdbca2236e6c07a34cd25f9175458120f4a278d6e1
 DIST kovpn-0.3_pre2.tar.bz2 3592040 RMD160 35b5edcc1c0d08b9ff5807c862a882c7bc04ae4d SHA1 870a2b67648514931bf57aac58e6d8f052b9544d SHA256 338aa0a1b8a00a87daa474c0be325ae5b20b69c431f48df851944ff4fdf4ca01
 DIST kovpn-0.3_pre6.tar.bz2 860206 RMD160 8a5eac49b6727403095c0bd80fe276424809c33c SHA1 c33e5e30a8e5212962bab0918b1b7810e3f6768c SHA256 98644c91c89e682fd0804337ad0d12eb5b2ef57f88104805492ca23d64c3f75b
@@ -12,14 +13,18 @@ EBUILD kovpn-0.3_pre2.ebuild 507 RMD160 7e363346ce600ea1c98cece356f15e65ebb4ba6f
 MD5 d26cdcf62299779ebc088e5ccf3f2103 kovpn-0.3_pre2.ebuild 507
 RMD160 7e363346ce600ea1c98cece356f15e65ebb4ba6f kovpn-0.3_pre2.ebuild 507
 SHA256 e8f493d70c40b09ec61a352a3458dbd18d9bf369c8cebf6b0239966fcc0c48e7 kovpn-0.3_pre2.ebuild 507
+EBUILD kovpn-0.3_pre6-r1.ebuild 590 RMD160 9f94a02ec443360d00b6a82086eb9c56c5675aac SHA1 70fe5ea30138e0298d784306f9b578dc3304c78f SHA256 14a7f7eff7adcb51c435b2bf8ce9093a8e4abe41fbc4342a0e45ed784a57fd4c
+MD5 ea53c10004b2d8d7faf6686368ae66f5 kovpn-0.3_pre6-r1.ebuild 590
+RMD160 9f94a02ec443360d00b6a82086eb9c56c5675aac kovpn-0.3_pre6-r1.ebuild 590
+SHA256 14a7f7eff7adcb51c435b2bf8ce9093a8e4abe41fbc4342a0e45ed784a57fd4c kovpn-0.3_pre6-r1.ebuild 590
 EBUILD kovpn-0.3_pre6.ebuild 507 RMD160 6ec2798d8828c6a8f9eb52abc2df3e1e28944b4c SHA1 2c18bc90a1220d6bd6cb00268e739b1164726936 SHA256 c48c0d11b61e09034d3d69ad159bbf06adce161032fdad876527a7cbcaf84a0a
 MD5 bc2faae3615415eeea685832e1b6ad86 kovpn-0.3_pre6.ebuild 507
 RMD160 6ec2798d8828c6a8f9eb52abc2df3e1e28944b4c kovpn-0.3_pre6.ebuild 507
 SHA256 c48c0d11b61e09034d3d69ad159bbf06adce161032fdad876527a7cbcaf84a0a kovpn-0.3_pre6.ebuild 507
-MISC ChangeLog 745 RMD160 0cdba0783080fdebac6d0a261998afe8922950ee SHA1 ef30c98e139ab37045de7c16d85bee0e76ba0124 SHA256 5f385fc3258b9675ab27c9b1da8259738528eb7bbdb14805f6ae78822caa164b
-MD5 1cda297265be0803773dfcf72895ecec ChangeLog 745
-RMD160 0cdba0783080fdebac6d0a261998afe8922950ee ChangeLog 745
-SHA256 5f385fc3258b9675ab27c9b1da8259738528eb7bbdb14805f6ae78822caa164b ChangeLog 745
+MISC ChangeLog 936 RMD160 9ce55e1dd1766de6e0957ff67ef601dac25e41b0 SHA1 0533367f5bc627af8efafc51ebb3b3dd66ac3ea8 SHA256 ac85c5760a6639be3a40aee3986adfc58113ac9dc7aa08f41519b9cd3c8a506c
+MD5 b436a850150202624c045cfd955a46df ChangeLog 936
+RMD160 9ce55e1dd1766de6e0957ff67ef601dac25e41b0 ChangeLog 936
+SHA256 ac85c5760a6639be3a40aee3986adfc58113ac9dc7aa08f41519b9cd3c8a506c ChangeLog 936
 MISC metadata.xml 222 RMD160 88b0f9f0911f20881c2c87e436a2657f95f485a8 SHA1 c8113bfaf5c618bb55458ce5aef07ebaf232da90 SHA256 2355dc88d92731b72b6c3873963a60670f794b79482b0d76284d8f848a00f173
 MD5 fa84c4dfbafeff445d9322895876ddeb metadata.xml 222
 RMD160 88b0f9f0911f20881c2c87e436a2657f95f485a8 metadata.xml 222
@@ -33,10 +38,6 @@ SHA256 a8d45bbe2db1cc0a24e4db930d3f743d919553b28b6c38c34b3e4316bca09f9d files/di
 MD5 e0d7dacb9ad8fe029c19879beca2d1ac files/digest-kovpn-0.3_pre6 247
 RMD160 66eed329c49db543fa2902c32c7fe72b8fae1824 files/digest-kovpn-0.3_pre6 247
 SHA256 9a861b9e35fc4ddcada2fe4c72a5b39ebc1288a6ace0d5bf5e94ee6104c05da6 files/digest-kovpn-0.3_pre6 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEqD4xKtJO8LeSoosRAoVJAJ4pudnAtWUwxxMoHyk+fEMvYCminQCfeh9N
-sm1Zhv13UQvzvl5M98zcOJQ=
-=A9nz
------END PGP SIGNATURE-----
+MD5 e0d7dacb9ad8fe029c19879beca2d1ac files/digest-kovpn-0.3_pre6-r1 247
+RMD160 66eed329c49db543fa2902c32c7fe72b8fae1824 files/digest-kovpn-0.3_pre6-r1 247
+SHA256 9a861b9e35fc4ddcada2fe4c72a5b39ebc1288a6ace0d5bf5e94ee6104c05da6 files/digest-kovpn-0.3_pre6-r1 247
diff --git a/net-misc/kovpn/files/digest-kovpn-0.3_pre6-r1 b/net-misc/kovpn/files/digest-kovpn-0.3_pre6-r1
new file mode 100644
index 000000000000..97dae2e93e18
--- /dev/null
+++ b/net-misc/kovpn/files/digest-kovpn-0.3_pre6-r1
@@ -0,0 +1,3 @@
+MD5 5cb3ddf5248d3d83b96d831555ef1cf7 kovpn-0.3_pre6.tar.bz2 860206
+RMD160 8a5eac49b6727403095c0bd80fe276424809c33c kovpn-0.3_pre6.tar.bz2 860206
+SHA256 98644c91c89e682fd0804337ad0d12eb5b2ef57f88104805492ca23d64c3f75b kovpn-0.3_pre6.tar.bz2 860206
diff --git a/net-misc/kovpn/files/traywindow_x86_64.patch b/net-misc/kovpn/files/traywindow_x86_64.patch
new file mode 100644
index 000000000000..8c50d425a9c3
--- /dev/null
+++ b/net-misc/kovpn/files/traywindow_x86_64.patch
@@ -0,0 +1,20 @@
+--- src/traywindow.cpp.orig	2006-07-23 13:26:21.236380500 +0100
++++ src/traywindow.cpp	2006-07-23 13:26:38.625467250 +0100
+@@ -107,7 +107,7 @@
+    delete mDisconnectMenuItems[ manager->id() ];
+ 
+    /* I think (int) manager is unique and static enough to be used as id for the menu */
+-   mContextMenu->removeItem( ( int ) manager );
++   mContextMenu->removeItem( ( long ) manager );
+    mManagerMenus.remove( manager->id() );
+    mOvpnManagers.remove( manager );
+ }
+@@ -125,7 +125,7 @@
+ 
+    mManagerMenus[ manager->id() ] = new KPopupMenu( mContextMenu );
+    /* I think (int) manager is unique and static enough to be used as id for the menu */
+-   mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( int ) manager, 5 );
++   mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( long ) manager, 5 );
+ 
+    mManagerMenus[ manager->id() ] ->insertTitle( i18n( "Status: Unavailable" ), 0 );
+ 
diff --git a/net-misc/kovpn/kovpn-0.3_pre6-r1.ebuild b/net-misc/kovpn/kovpn-0.3_pre6-r1.ebuild
new file mode 100644
index 000000000000..0d44d4df5adc
--- /dev/null
+++ b/net-misc/kovpn/kovpn-0.3_pre6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kovpn/kovpn-0.3_pre6-r1.ebuild,v 1.1 2006/09/14 09:45:14 ian Exp $
+
+inherit kde
+
+DESCRIPTION="kovpn - a simple OpenVPN GUI"
+SRC_URI="http://home.bawue.de/~lighter/www.enlighter.de/files/${P}.tar.bz2"
+HOMEPAGE="http://www.enlighter.de"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="0"
+S=${WORKDIR}/${P}
+
+DEPEND=">=net-misc/openvpn-2.0"
+need-kde 3.4
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/traywindow_x86_64.patch
+}