Fix compile problem wrt bug #159354. Many thanks to Martin Balaz.

Package-Manager: portage-2.1.2.2

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index a8adc2f6620fb97c14d707855a4bb30c46666946..09c77c1796300ec78bd88b24b0ad794c3d1cf847 100644 (file)
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.25 2007/02/22 00:35:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.26 2007/03/23 19:56:58 je_fro Exp $
+
+  23 Mar 2007; Jeff Gardner <je_fro@gentoo.org>
+  +files/3.12.4/apcupsd-snmp.patch, apcupsd-3.12.4.ebuild:
+  Fix compile problem wrt bug #159354. Many thanks to Martin Balaz.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index f28e00d8322d09e3d2285f0f568bacb21f3e2045..560faba53c705fb3dcad766d6227492c72769545 100644 (file)
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.10.15/apache.conf 157 RMD160 3cbd37e49916ee5bf6cfc21d3734430e0bff9f8c SHA1 ee4e6f2d682c36b55a038b956b522096c1cc0721 SHA256 c56dea432abd46f89365780f76928bebaf7e2f72b58a24915da530e535e71b4a
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
 RMD160 3cbd37e49916ee5bf6cfc21d3734430e0bff9f8c files/3.10.15/apache.conf 157
@@ -77,6 +74,10 @@ AUX 3.12.3/etc.patch 3710 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 SHA1 e
 MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.3/etc.patch 3710
 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.3/etc.patch 3710
 SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.3/etc.patch 3710
+AUX 3.12.4/apcupsd-snmp.patch 371 RMD160 37ab765f0938b42aba7e7c2d83e3209bab73428a SHA1 b9d03a3b27cb1c656ab52df86e9bc1b38ed5e3ca SHA256 7a2ff13ed11140943e84c4ea933fd0475d594b624e38ac8f24c53f7531e0e907
+MD5 b4b398f5da24d81b7899f81e753cfb79 files/3.12.4/apcupsd-snmp.patch 371
+RMD160 37ab765f0938b42aba7e7c2d83e3209bab73428a files/3.12.4/apcupsd-snmp.patch 371
+SHA256 7a2ff13ed11140943e84c4ea933fd0475d594b624e38ac8f24c53f7531e0e907 files/3.12.4/apcupsd-snmp.patch 371
 AUX 3.12.4/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 SHA1 8e976c8f3316b8b7a056a9a5a3a432be66131854 SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08
 MD5 b16ab90b6b83806a03c27aef26c4d0f0 files/3.12.4/apcupsd.in.patch 273
 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 files/3.12.4/apcupsd.in.patch 273
@@ -136,14 +137,14 @@ EBUILD apcupsd-3.12.3.ebuild 3031 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313
 MD5 762856dea9f3da3eb8c78da2c6cd2725 apcupsd-3.12.3.ebuild 3031
 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313c apcupsd-3.12.3.ebuild 3031
 SHA256 df9c5dbe920a0a4be9e4f1385990096d970941af4424ac3c6b235eccbf3a65fc apcupsd-3.12.3.ebuild 3031
-EBUILD apcupsd-3.12.4.ebuild 2975 RMD160 b308b2d900db14a1b635d072aef345d14485e477 SHA1 b4ce8e79783311f0aa335a2156c05e1e6d1b7242 SHA256 d032ec08b84c0e14317ed8338c61aafdb694314a9088c02b5b03e76a339c41ac
-MD5 a1d95410992eb6fe452a862240eb0de7 apcupsd-3.12.4.ebuild 2975
-RMD160 b308b2d900db14a1b635d072aef345d14485e477 apcupsd-3.12.4.ebuild 2975
-SHA256 d032ec08b84c0e14317ed8338c61aafdb694314a9088c02b5b03e76a339c41ac apcupsd-3.12.4.ebuild 2975
-MISC ChangeLog 14899 RMD160 5e7ed16637b64180bee5460bae78d0dfd38590ea SHA1 0246189641f74f1a0ecc37054f3af66a0d4064bc SHA256 4b98d74d4e91c7736e16e7f623b9ed56d51f4931d403daef14d870151c147f31
-MD5 6edeb6de1da5de0f9efc567e09b5bb07 ChangeLog 14899
-RMD160 5e7ed16637b64180bee5460bae78d0dfd38590ea ChangeLog 14899
-SHA256 4b98d74d4e91c7736e16e7f623b9ed56d51f4931d403daef14d870151c147f31 ChangeLog 14899
+EBUILD apcupsd-3.12.4.ebuild 3020 RMD160 2a82a750526eff235c61f541ad4ed92a8e90bac8 SHA1 ed0fcad5b25af3c8db22f66bf5782638ddc76fe0 SHA256 ab7c3ed80c4677c60332050b42974db44a3ac661faba32db0948eec574706e09
+MD5 c35dce4d81f05664f8d54afe4f9b7aad apcupsd-3.12.4.ebuild 3020
+RMD160 2a82a750526eff235c61f541ad4ed92a8e90bac8 apcupsd-3.12.4.ebuild 3020
+SHA256 ab7c3ed80c4677c60332050b42974db44a3ac661faba32db0948eec574706e09 apcupsd-3.12.4.ebuild 3020
+MISC ChangeLog 15076 RMD160 a6c95adbc3b15d8ab976932004caed122a469f4a SHA1 539e4b2ef5a34b5d63a40fd2953235f03d1143c3 SHA256 447e9475c021a5bf80b7c9dfeb679d9095d99acaf0055da71f157d67e5bf5f0d
+MD5 f1a294fe49e7b046f697c8bde881851c ChangeLog 15076
+RMD160 a6c95adbc3b15d8ab976932004caed122a469f4a ChangeLog 15076
+SHA256 447e9475c021a5bf80b7c9dfeb679d9095d99acaf0055da71f157d67e5bf5f0d ChangeLog 15076
 MISC metadata.xml 226 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 SHA1 360c056f345a7b50026e93de38b0167f4193904f SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 metadata.xml 226
@@ -175,10 +176,3 @@ SHA256 d58799a245c99f70317f119d8a5efa2743aec4dc47d4b4299bed0e75e8b3a9f4 files/di
 MD5 c3ff7448e5d220ac620e4b47c6f07152 files/digest-apcupsd-3.12.4 247
 RMD160 7d8135db6d69f367b6f756836b61d75921c3bb00 files/digest-apcupsd-3.12.4 247
 SHA256 d5ada22441893d49204b66ed425a7b2b9081e985824ebb9a55b67b3001e98a42 files/digest-apcupsd-3.12.4 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3OUCz974XjDVpbkRAvOjAKCZrNKF2ulEMLmgsBxREgGuvOi1OgCfQeyN
-ZegiuqfEhgLWuUnrxG84PBI=
-=SaQi
------END PGP SIGNATURE-----

diff --git a/sys-power/apcupsd/apcupsd-3.12.4.ebuild b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
index d02bb4bde6c418b339f73ba23080ed66b187774c..199f6997bafca470605590fb6b347892e0951dac 100644 (file)
--- a/sys-power/apcupsd/apcupsd-3.12.4.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.12.4.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/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.5 2006/12/19 22:46:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.6 2007/03/23 19:56:58 je_fro Exp $
 
 WEBAPP_MANUAL_SLOT="yes"
 inherit eutils webapp
@@ -34,6 +34,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PV}/exit-status-build.patch
        epatch "${FILESDIR}"/${PV}/no-strip.patch
        epatch "${FILESDIR}"/${PV}/no-parallel.patch
+       epatch "${FILESDIR}"/${PV}/${PN}-snmp.patch
 }
 
 src_compile() {

diff --git a/sys-power/apcupsd/files/3.12.4/apcupsd-snmp.patch b/sys-power/apcupsd/files/3.12.4/apcupsd-snmp.patch
new file mode 100644 (file)
index 0000000..7e0bc54
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.4/apcupsd-snmp.patch
@@ -0,0 +1,10 @@
+--- apcupsd-3.12.4-old/src/drivers/snmp/snmp.h 2007-03-23 13:58:21.000000000 -0500
++++ apcupsd-3.12.4/src/drivers/snmp/snmp.h     2007-03-23 13:59:24.000000000 -0500
+@@ -39,6 +39,7 @@
+ #else
+ 
+ # ifdef HAVE_NET_SNMP
++#  include <net-snmp/net-snmp-config.h>
+ #  include <net-snmp/library/asn1.h>
+ #  include <net-snmp/library/snmp.h>
+ #  include <net-snmp/library/snmp_api.h>