net-analyzer/mk-livestatus: Patch applied upstream, bug #482026

6 files changed, 0 insertions, 191 deletions

diff --git a/net-analyzer/mk-livestatus/ChangeLog b/net-analyzer/mk-livestatus/ChangeLog
deleted file mode 100644
index 9b4f09f9..00000000
--- a/net-analyzer/mk-livestatus/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-*mk-livestatus-1.2.2_p2 (21 Aug 2013)
-
-  21 Aug 2013; Bertrand Jacquin <beber@meleeweb.net>
-  +files/mk-livestatus-1.2.2_p2-no-strip.diff,
-  +files/mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff, +metadata.xml,
-  +mk-livestatus-1.2.2_p2.ebuild:
-  Bug #482026, net-analyzer/mk-livestatus: Move to EAPI 5, Move to python-r1,
-  Fix '-s' LDFLAGS stripping by moving to a patch instead of a sed what I
-  consider more safe, As src/Makefile.am is modified, call eautoreconf and
-  inherit autotools, patch for api/perl/t/perlcriticrc to remove the usage of
-  Perl::Critic::Policy::Modules::ProhibitAutomaticExportation which does not
-  exist since http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl
-  /Perl-Critic/metadata.xml?r1=1.3&r2=1.4, PREFIX compliant, Refresh perl
-  DEPENDs
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
deleted file mode 100644
index b10583b4..00000000
--- a/net-analyzer/mk-livestatus/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mk-livestatus-1.2.2_p2-no-strip.diff 902 SHA256 0adfdf8a0870f821c66232dc1172344d5422a09cbc759ceef9635a73c447d03a WHIRLPOOL 5da4987ca95a949ca084d513fabca2573cd7691c1986bab51a5747f89e6e3fa2d33d366f113f978fae1e662c7b4e2203cb25db3ae6fc7caec91b79e908f3e62a
-AUX mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff 549 SHA256 e329e81cd9ba4a1903ba5d72c80c01b338680aad5a05a140ab67ef64af4ecb61 WHIRLPOOL ffe12d03aec794e0ad06c45f5a8b70be604805f18923c0652954881512414de39301c00097b0e5b5e4699f071663e99722d4eeaae4b4c887f3bec2b25a91e03a
-DIST mk-livestatus-1.2.2p2.tar.gz 382165 SHA256 77213f22898cd6280196293743e9ef9486ffccca878350ed277d358146a6d0b5 WHIRLPOOL f3a6405624ef25a1916b75236bd13923eb2582dfdc156f02702e05950c744883b75c00c13de5a5a64b306aef92bfd29b582130fad292320bbea765384c728f97
-EBUILD mk-livestatus-1.2.2_p2.ebuild 2365 SHA256 b558e347a71dc542f272f087b47dcbbb161d1f77c2cb3903ec045582feee40ed WHIRLPOOL 9df384e1066989aba46532935f145df72ad5071d33aecf49542ef2b19f8aecfb93ee99b86aef46f93ec9005add201263dc5032fd33882f8f8eafdcb58f40ccde
-MISC ChangeLog 795 SHA256 ab0bc0c86aa062decda32aa2c683078398b4a16d1c50525696ce7fdcce2ac57b WHIRLPOOL 635c554b12647be36d00a048baad1f13aeec1fb3ec314cf29a29e29e723fc10b55908ec196bea931b43250da1fae1ec5bb8e4afdfa99cd68e7bc29284e8439a8
-MISC metadata.xml 253 SHA256 7abb506214c868e10b0221b1e98f242853981158da6a09396684e13305b14cd5 WHIRLPOOL c177c1486a191261b8c790ed10b084d33b2232e35668f2c1002422dec7eb0f22f612f1303a91564bda2a679d9a18e16575284aaa464bb016d7fefb188dc24f1f
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
deleted file mode 100644
index a3f81a50..00000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-no-strip.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index 95b2830f..00000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p2-test-RequireRcsKeywords.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./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/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
deleted file mode 100644
index 6be0b9b8..00000000
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer>
-        <email>idl0r@gentoo.org</email>
-        <name>Christian Ruppert</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p2.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p2.ebuild
deleted file mode 100644
index 5a3e73c2..00000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-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}"
-
-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"
-IUSE="examples perl python test"
-
-RDEPEND="perl? (
-		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: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: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
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	epatch "${FILESDIR}/${P}-no-strip.diff"
-	epatch "${FILESDIR}/${P}-test-RequireRcsKeywords.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf
-
-	if use perl; then
-		cd api/perl/
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	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="${ED}" install-binPROGRAMS install-data-local
-
-	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
-		fi
-	fi
-
-	if use python; then
-		python_foreach_impl python_domodule api/python/livestatus.py
-
-		if use examples; then
-			newdoc api/python/README
-
-			docinto examples/
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}