Add patch to properly solve compile issue.

diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index cd286ae4a65412dc8444b54dbff73e137800a975..e74019e088d1553f416355f33905ee45311b85b8 100644 (file)
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -7,7 +7,7 @@ MD5 4c0a7868d1c0904614a94be126722075 kdeutils-3.2.2.ebuild 526
 MD5 592155a5cbbe2a577e94b6c5958626c6 kdeutils-3.3.0.ebuild 377
 MD5 1b720168b16276832e8c2292e3622dc9 kdeutils-3.1.5.ebuild 380
 MD5 284dc00f9c9edbca8507d07912ae82ec kdeutils-3.3.1.ebuild 385
-MD5 7749b2fa0188a92590b18d1d11ee1f98 kdeutils-3.4.0_beta1.ebuild 752
+MD5 50cf58bcfb2da063af0b529c37c4964f kdeutils-3.4.0_beta1.ebuild 635
 MD5 05b9d1b4ba4d8c54a0d5224cca5de6fa files/digest-kdeutils-3.2.2 68
 MD5 40be85c9e2811d00aea01f19a6b743ee files/digest-kdeutils-3.1.5 68
 MD5 8d2bf90b91493ae30edaf1de4f3eefa6 files/digest-kdeutils-3.2.0 68
@@ -16,5 +16,6 @@ MD5 467b43a24a73f26d625e65d6f4a1da44 files/digest-kdeutils-3.2.3 68
 MD5 95a30bd883c334e2f6c5f417ac53c9c9 files/digest-kdeutils-3.3.2 68
 MD5 80408e337e4ee6d198e346202b709f6b files/kdeutils-3.2.2-gcc34-compile.patch 1987
 MD5 802fe65a58c9c51de3ef743cfdad56e2 files/digest-kdeutils-3.4.0_beta1 69
+MD5 5cd96fb39354728fd08f80a66155cd4f files/kdeutils-3.4.0_beta1-snmpfix.patch 923
 MD5 02a15ee0a707766a50b1f1ef0f9f80f4 files/digest-kdeutils-3.3.1 68
 MD5 a70645f7e4d4e5c1ba0e2e8f32d4d220 files/kdeutils-3.2.2-tarfix.patch 460

diff --git a/kde-base/kdeutils/files/kdeutils-3.4.0_beta1-snmpfix.patch b/kde-base/kdeutils/files/kdeutils-3.4.0_beta1-snmpfix.patch
new file mode 100644 (file)
index 0000000..45bbfe9
--- /dev/null
+++ b/kde-base/kdeutils/files/kdeutils-3.4.0_beta1-snmpfix.patch
@@ -0,0 +1,22 @@
+diff -Npaur kdeutils-3.3.91/ksim/monitors/snmp/snmplib.h kdeutils-3.3.91-fixed/ksim/monitors/snmp/snmplib.h
+--- kdeutils-3.3.91/ksim/monitors/snmp/snmplib.h       2003-08-29 11:56:50.000000000 +0200
++++ kdeutils-3.3.91-fixed/ksim/monitors/snmp/snmplib.h 2005-01-15 12:03:30.497268728 +0100
+@@ -21,6 +21,7 @@
+ #define SNMPLIB_H
+ 
+ // ### REMOVEME: move snmplib somewhere else
++#define HAVE_STRLCPY 1
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ 
+diff -Npaur kdeutils-3.3.91/ksim/monitors/snmp/value_p.h kdeutils-3.3.91-fixed/ksim/monitors/snmp/value_p.h
+--- kdeutils-3.3.91/ksim/monitors/snmp/value_p.h       2003-08-27 15:51:50.000000000 +0200
++++ kdeutils-3.3.91-fixed/ksim/monitors/snmp/value_p.h 2005-01-15 12:03:44.323983848 +0100
+@@ -20,6 +20,7 @@
+ #ifndef VALUE_P_H
+ #define VALUE_P_H
+ 
++#define HAVE_STRLCPY 1
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ 

diff --git a/kde-base/kdeutils/kdeutils-3.4.0_beta1.ebuild b/kde-base/kdeutils/kdeutils-3.4.0_beta1.ebuild
index c0402beb1903ad61bb5ae0154ce70ce1f9580bef..7c9824209891fe8d2d2e9b174fd63206cc255910 100644 (file)
--- a/kde-base/kdeutils/kdeutils-3.4.0_beta1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.4.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.0_beta1.ebuild,v 1.2 2005/01/15 00:14:44 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.0_beta1.ebuild,v 1.3 2005/01/15 13:54:01 greg_g Exp $
 
 inherit kde-dist
 
@@ -15,13 +15,15 @@ DEPEND="~kde-base/kdebase-${PV}
 RDEPEND="${DEPEND}
        crypt? ( app-crypt/gnupg )"
 
+src_unpack() {
+       kde_src_unpack
+
+       # applied upstream, will be in beta2
+       epatch ${FILESDIR}/${P}-snmpfix.patch
+}
+
 src_compile() {
        use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
 
-       # ugly hack: net-snmp provides a prototype for strlcpy for packages
-       # that link against it, but kdeutils too provides a prototype for
-       # strlcpy in config.h since it can't find one.
-       use snmp && export kde_cv_proto_strlcpy=no
-
        kde_src_compile
 }