Version bump. Cleanup. Bug 482026, thanks to Bertrand Jacquin <beber@meleeweb.net>

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

7 files changed, 111 insertions, 153 deletions

diff --git a/net-analyzer/mk-livestatus/ChangeLog b/net-analyzer/mk-livestatus/ChangeLog
index cd3f7bbd3ce6..8f95a0805c58 100644
--- a/net-analyzer/mk-livestatus/ChangeLog
+++ b/net-analyzer/mk-livestatus/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/mk-livestatus
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mk-livestatus/ChangeLog,v 1.6 2012/12/22 18:24:19 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mk-livestatus/ChangeLog,v 1.7 2013/12/03 23:16:35 idl0r Exp $
+
+*mk-livestatus-1.2.2_p2 (03 Dec 2013)
+
+  03 Dec 2013; Christian Ruppert <idl0r@gentoo.org>
+  -mk-livestatus-1.1.8.ebuild, -mk-livestatus-1.1.10_p1.ebuild,
+  +mk-livestatus-1.2.2_p2.ebuild, +files/mk-livestatus-1.2.2_p2-no-strip.diff,
+  +files/mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff,
+  -files/gcc-4.7-compile.patch:
+  Version bump. Cleanup. Bug 482026, thanks to Bertrand Jacquin
+  <beber@meleeweb.net>
 
   22 Dec 2012; Agostino Sarubbo <ago@gentoo.org> mk-livestatus-1.2.0_p2.ebuild:
   Add ~ppc, wrt bug #429088
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 1755af56faac..5c9eedb5fe1d 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -1,9 +1,22 @@
-AUX gcc-4.7-compile.patch 324 SHA256 4c93f8cffdeb79ae460db7d15922228a3a56a3bfa318ed7f0aeff7fb5383cef3 SHA512 e60a837336cccd6aa37a7e634d71ff34dc6da43ebc71620db9cc3fd708309f52bdad4bf80728330c5ef01f2330605ba3170ab3b6720aa49c2670238ccd6da3db WHIRLPOOL 2a9b894e6350612ef0066cf7604fba881c13dc7a04d73e8540e82da8fa17bb3f3425c6490ac2693364bc16fbbe6ad3be9654f1deb7c071d5856045ebcce2356e
-DIST mk-livestatus-1.1.10p1.tar.gz 326280 SHA256 7e68f85f472ae707dd7bf74c7e2b3a8d8703e9731e3abc0558b82119660985b6 SHA512 e10d4af1e25f5a410e8ab79120c445e4269c35b9859970a42259d47ca8460c685648bf153036efaa61fc4679c06aaf70eaa6e150fa6f28fde406d76df21aa7ba WHIRLPOOL 973359b0e30110342c3fb5fb1b6b349cdbafdc1735f491d522c172c4abfec89834165e5d934cbeb7f51eee031ff1988c2e8bf1b665300158072891664bd3916f
-DIST mk-livestatus-1.1.8.tar.gz 323754 SHA256 b9f3449664625a5b23a24dfd015f2ad1e3b5829d45a3b9502051f9121c0da17d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX mk-livestatus-1.2.2_p2-no-strip.diff 902 SHA256 0adfdf8a0870f821c66232dc1172344d5422a09cbc759ceef9635a73c447d03a SHA512 106b054079cce53cf6c56a1f41202df2819e15fdf4d3efc599dae84a860ea808572d804ac81c82b076c2a15e8b633b026233861cc27ab7c4b0c60c6b0d732aa8 WHIRLPOOL 5da4987ca95a949ca084d513fabca2573cd7691c1986bab51a5747f89e6e3fa2d33d366f113f978fae1e662c7b4e2203cb25db3ae6fc7caec91b79e908f3e62a
+AUX mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff 549 SHA256 e329e81cd9ba4a1903ba5d72c80c01b338680aad5a05a140ab67ef64af4ecb61 SHA512 aca7b7d0c78984df856e7fcba364aac5c4c63cf57a33d842392b32cd7735e66099df523c6d46569a57fcc92f00750440ec53e951cbc3f7e8eaa8fe544ea9e46c WHIRLPOOL ffe12d03aec794e0ad06c45f5a8b70be604805f18923c0652954881512414de39301c00097b0e5b5e4699f071663e99722d4eeaae4b4c887f3bec2b25a91e03a
 DIST mk-livestatus-1.2.0p2.tar.gz 371580 SHA256 d4f6918fe64ae09774e059096814ccba9fcba984179504fa5fc7a8b9b288dfba SHA512 d27f822a4b060c29c37e059e5d8f913ef242bfdb96a22677521de9babb62b9b3517c8b0ca409c02f9ee27e319d1229a9ca305d039092c5eb030479b7123ef00d WHIRLPOOL e822ddba2ad0d4c56f7ce079a6bb78671637c808d28fb73bbafc83c46a1fccc3b37f078f12da36ed867475cbeaebd4fd4c0a0dc137a67ed96397f0ce5aadf8a8
-EBUILD mk-livestatus-1.1.10_p1.ebuild 2292 SHA256 1371efe5519d01a2e90781a2b7e7ea551b384996359220427da58d66ae3f0ecb SHA512 88553ba894e104be83d775fb8620a9d923279f99a75f7ee0ae04bbd48b848b119e5dae822e1bc45777772daaa09fe46fbc79bf519702f5d522ee77f1c092953b WHIRLPOOL 7a6b39e40051859641a4a58136bfacfc386b8f8b4f5b6d4659c7f32dc3441c7524bc231ded4c4d989598abb364518836b27d4f1b8e62fd066010447aa595b90a
-EBUILD mk-livestatus-1.1.8.ebuild 2167 SHA256 c9005f84738428e1950a5d1fb0a388c31dec01e7e366df38c04e7e9c11849100 SHA512 e3fce6b39acce0860d0c24767ca6be1a9ae5e581c4516f3d6f74138ae62389b596f17271cc25572df31c02e1f808679be0570c8482145560f20a1b4aa91022b1 WHIRLPOOL d04e0ccd25f7b63767ad33c38ce3242c50091445ba2081b507ab76f02d758dce3edc627f97ba09d1ad4ab97c9e32ec5d5b5e17d2a62db5d462a90ba88953f5ec
+DIST mk-livestatus-1.2.2p2.tar.gz 382165 SHA256 77213f22898cd6280196293743e9ef9486ffccca878350ed277d358146a6d0b5 SHA512 25988fbb78ea114d217afddc8f866e254743e48958104fc9ffa7167ed59658138c842119d06bcf02610c894993a4ff493c14f8403bae3b05f796e95caeabff55 WHIRLPOOL f3a6405624ef25a1916b75236bd13923eb2582dfdc156f02702e05950c744883b75c00c13de5a5a64b306aef92bfd29b582130fad292320bbea765384c728f97
 EBUILD mk-livestatus-1.2.0_p2.ebuild 2425 SHA256 03ea996b010ac345b1cb9e47e4710c925091087d21d87297bb6b01f1d76fce0c SHA512 a5a10291937c7355b4e47f8905d2bf864713ae174cbd671a17fd5d617828ca378af3674c74c7e74e98d31db6b09f8f8c20a731a110e6db2ef2430cc2e0e8c0de WHIRLPOOL eea8c37c3a20e2a30851958acc60d2c05cc40af50782cee10349d12cdcb8d13b0da49817fa7844eba1ec8c995d03d3e26c23f21e643fa0a57ba7988d69c7dbe7
-MISC ChangeLog 1146 SHA256 21b1474f32a7f8a94edc9bec9c1e70931c2144026f0b9f84713a773effb3f130 SHA512 7fd46086adcc1ef2292bb4261877d7c37bdbebd260daf0a8fcaf649f160185e9ad88eb4912d714c3b114da8b2d0130999a685a0b1ad2c8027b1c791edd63433b WHIRLPOOL e2700287428155c7feebb63f4aa8485fd1065e2f60b17cb1ef4a1f75516725f2fc57eab00d1c9f5d99f5c319b272949c7dc4b7e6fed978c4ac01ddbfb69c2931
+EBUILD mk-livestatus-1.2.2_p2.ebuild 2565 SHA256 cd2590bf53cdfa6e2d1f267186d5edbd7d78bc935edc76e7e74cf397dbda1a0b SHA512 f16ec0a77d2ccedc496f72768c34bd923419af773a7d8a472a0783b809e1a6614d82aa46ef581e903007fe49779e1c4c714c84f5fd96abed85b45f34575918b8 WHIRLPOOL 8bc70d2ac806ebe958ac75e587b82c0b8369d860a7ca675747a439007a8b0a670d299148be924e1bdd8e7eae1338c217558863a60c7e6207ee840148a3c715fc
+MISC ChangeLog 1564 SHA256 de36b35a522c0f50d4bba46ce7d454835e6f9d698a1b882e51a8e6748cfc0f28 SHA512 92ebc1fdf5b478f989f6cad1e31ef0eaf45cf8c1181da24e49d9b577c3eec174972b714550f784b9d1d886853dc3d77610a44dc6a7cf864711ecdc3da45bff78 WHIRLPOOL 73a92ebb17a4955693f3b40bb9bc04fe9f7f45d9d795ac3b7fc91b80208849637b1e79c672b438c25e28c94d23dfd13b476a7ca5d46ed7c2574c980f91132dfa
 MISC metadata.xml 235 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991 SHA512 0f45c3328380643ee0ef6bccc13ca318f26525fbcf9669527745a51e5c910532f1b5aef64247f5cf019a7515df659909427a76e3691edb878f5c31b172d9b4e1 WHIRLPOOL 0b2b4c1e5917851d05a390f05eaad3cd094439b542857e42fc6c4183cf65664b2f8b153d2d11b465494523925bcaf1215c4d485a63f4c9443df769e05c0a9e9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSnmZZAAoJEMOx0zmdw4Z1WLoIAI2+691morc9VLYNj5vhmkp1
+Sgg2uL2fgd63oid5W1UkfOh54kBl2TMpEr8A7y2ewKeNpGlIYe2eCZIrI9rNy9XL
+lvptLE9lIotz+EzDqqSO68ZwSh966KqyWWHIoS+pqftSMvgmq3lINEJxGQsGOWnq
+j+Lnje0iOsrIkqYXbwrr0KCrFscah5O4KjSJ4AVEV1b4X+d5nui8uBEw4wSfHmdV
+uqDTbQSfoAW0D67t+1BRl1D5MJ5/DIaPVvWEeP9an843JXvYqQw4xMb4tr4MulKj
+CIG9Ta+NnTkIu7SRRa6P9KFGxXmDbUk0DscXERNUx6uKSA+tybGVDqjxKJ1QMoQ=
+=YlVh
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/mk-livestatus/files/gcc-4.7-compile.patch b/net-analyzer/mk-livestatus/files/gcc-4.7-compile.patch
deleted file mode 100644
index 186f610109f6..000000000000
--- a/net-analyzer/mk-livestatus/files/gcc-4.7-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/TableLog.cc.orig	2012-07-07 19:52:47.171651476 +0200
-+++ src/TableLog.cc	2012-07-07 19:53:20.291525974 +0200
-@@ -41,6 +41,8 @@
- #include "TableCommands.h"
- #include "TableContacts.h"
- 
-+#include <cstddef>
-+
- #define CHECK_MEM_CYCLE 1000 /* Check memory every N'th new message */
- 
- // watch nagios' logfile rotation
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-no-strip.diff b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-no-strip.diff
new file mode 100644
index 000000000000..a3f81a5054cb
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-no-strip.diff
@@ -0,0 +1,23 @@
+--- src/Makefile.am	2013-08-20 14:24:46.000000000 +0200
++++ src/Makefile.am	2013-08-20 14:25:20.000000000 +0200
+@@ -54,9 +54,9 @@
+ 
+ livecheck$(EXEEXT): livecheck.c strutil.c check_icmp.c 
+ if HAVE_DIET
+-	diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^
++	diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^
+ else
+-	$(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^
++	$(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^
+ endif
+ 
+ livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC
+@@ -64,7 +64,7 @@
+ 
+ livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
+ 	-rm -f plugin.so
+-	$(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++
++	$(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++
+ 
+ all-local: livestatus.o
+ 
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff
new file mode 100644
index 000000000000..95b2830feccf
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff
@@ -0,0 +1,18 @@
+--- ./api/perl/t/perlcriticrc	2013-08-21 22:37:57.791099241 +0200
++++ ./api/perl/t/perlcriticrc	2013-08-21 22:38:02.943210061 +0200
+@@ -133,8 +133,6 @@ severity   = 3
+ [Perl::Critic::Policy::Miscellanea::ProhibitTies]
+ severity   = 4
+ 
+-[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
+-
+ [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
+ severity   = 4
+ 
+@@ -283,4 +281,4 @@ severity   = 5
+ severity   = 5
+ 
+ [Perl::Critic::Policy::Variables::RequireNegativeIndices]
+-severity   = 4
+\ No newline at end of file
++severity   = 4
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.1.8.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.1.8.ebuild
deleted file mode 100644
index 586f0260a751..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.1.8.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mk-livestatus/mk-livestatus-1.1.8.ebuild,v 1.3 2011/04/27 13:50:15 idl0r Exp $
-
-EAPI=3
-
-GENTOO_DEPEND_ON_PERL=no
-PERL_EXPORT_PHASE_FUNCTIONS=no
-
-inherit perl-module python
-
-DESCRIPTION="Nagios/Icinga event broker module that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples perl python test"
-
-RDEPEND="perl? (
-		dev-lang/perl
-		virtual/perl-Digest-MD5
-		virtual/perl-Thread-Queue
-	)"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Install
-		test? (
-			dev-perl/File-Copy-Recursive
-			dev-perl/Test-Pod
-			dev-perl/Test-Perl-Critic
-			dev-perl/Test-Pod-Coverage
-			dev-perl/Perl-Critic
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect
-			dev-perl/Perl-Critic-Deprecated
-			dev-perl/Perl-Critic-Nits
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-src_prepare() {
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc
-
-	if use perl; then
-		perl-module_src_prepare
-	fi
-
-	sed -i -e 's:$(LDFLAGS) -s:$(LDFLAGS):' src/Makefile.in || die
-}
-
-src_configure() {
-	econf
-
-	if use perl; then
-		cd api/perl/
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake || die
-
-	if use perl; then
-		cd api/perl
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl
-
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" install-binPROGRAMS install-data-local || die
-
-	if use perl; then
-		cd api/perl
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto examples/
-			dodoc api/perl/examples/dump.pl || die
-		fi
-	fi
-	if use python; then
-		insinto $(python_get_sitedir)
-		doins api/python/livestatus.py || die
-
-		if use examples; then
-			newdoc api/python/README README.python || die
-
-			docinto examples/
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py || die
-		fi
-	fi
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.1.10_p1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p2.ebuild
index 91c7f4a26376..6d6e53b36763 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.1.10_p1.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p2.ebuild
@@ -1,43 +1,51 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mk-livestatus/mk-livestatus-1.1.10_p1.ebuild,v 1.2 2012/09/03 18:48:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p2.ebuild,v 1.1 2013/12/03 23:16:35 idl0r Exp $
 
-EAPI=3
+EAPI=5
 
 GENTOO_DEPEND_ON_PERL=no
 PERL_EXPORT_PHASE_FUNCTIONS=no
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools perl-module python-r1 eutils
 
 MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
-inherit perl-module python eutils
-
 DESCRIPTION="Nagios/Icinga event broker module that allows quick/direct access to your status data"
 HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
 SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples perl python test"
 
 RDEPEND="perl? (
-		dev-lang/perl
-		virtual/perl-Digest-MD5
-		virtual/perl-Thread-Queue
+		dev-lang/perl:0
+		virtual/perl-Digest-MD5:0
+		virtual/perl-Scalar-List-Utils:0
+		>=virtual/perl-Thread-Queue-2.11:0
+		virtual/perl-Encode:0
+		dev-perl/JSON-XS:0
 	)"
 DEPEND="${RDEPEND}
 	perl? (
-		dev-perl/Module-Install
+		dev-perl/Module-Install:0
+		virtual/perl-ExtUtils-MakeMaker:0
+		virtual/perl-File-Path:0
+		virtual/perl-File-Spec:0
+		virtual/perl-File-Temp:0
 		test? (
-			dev-perl/File-Copy-Recursive
-			dev-perl/Test-Pod
-			dev-perl/Test-Perl-Critic
-			dev-perl/Test-Pod-Coverage
-			dev-perl/Perl-Critic
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect
-			dev-perl/Perl-Critic-Deprecated
-			dev-perl/Perl-Critic-Nits
+			dev-perl/File-Copy-Recursive:0
+			dev-perl/Test-Pod:0
+			dev-perl/Test-Perl-Critic:0
+			dev-perl/Test-Pod-Coverage:0
+			dev-perl/Perl-Critic:0
+			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
+			dev-perl/Perl-Critic-Deprecated:0
+			dev-perl/Perl-Critic-Nits:0
 		)
 	)"
 
@@ -55,9 +63,13 @@ src_prepare() {
 		perl-module_src_prepare
 	fi
 
-	sed -i -e 's:$(LDFLAGS) -s:$(LDFLAGS):' src/Makefile.in || die
+	epatch "${FILESDIR}/${P}-no-strip.diff"
+	epatch "${FILESDIR}/${P}-test-RequireRcsKeywords.diff"
 
-	epatch "${FILESDIR}/gcc-4.7-compile.patch"
+	# Script too old
+	rm -f missing
+
+	eautoreconf
 }
 
 src_configure() {
@@ -70,7 +82,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die
+	emake
 
 	if use perl; then
 		cd api/perl
@@ -88,7 +100,7 @@ src_test() {
 }
 
 src_install() {
-	emake -C src/ DESTDIR="${D}" install-binPROGRAMS install-data-local || die
+	emake -C src/ DESTDIR="${ED}" install-binPROGRAMS install-data-local
 
 	if use perl; then
 		cd api/perl
@@ -97,18 +109,18 @@ src_install() {
 
 		if use examples; then
 			docinto examples/
-			dodoc api/perl/examples/dump.pl || die
+			dodoc api/perl/examples/dump.pl
 		fi
 	fi
+
 	if use python; then
-		insinto $(python_get_sitedir)
-		doins api/python/livestatus.py || die
+		python_foreach_impl python_domodule api/python/livestatus.py
 
 		if use examples; then
-			newdoc api/python/README README.python || die
+			newdoc api/python/README README.python
 
 			docinto examples/
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py || die
+			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
 		fi
 	fi
 }