EAPI bump. Build fixes.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 56 insertions, 27 deletions

diff --git a/net-analyzer/quidscor/ChangeLog b/net-analyzer/quidscor/ChangeLog
index 592bc69613c4..ed8e8ad8eb61 100644
--- a/net-analyzer/quidscor/ChangeLog
+++ b/net-analyzer/quidscor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/quidscor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/ChangeLog,v 1.8 2011/01/15 23:59:27 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/ChangeLog,v 1.9 2014/07/20 13:27:27 jer Exp $
+
+  20 Jul 2014; Jeroen Roovers <jer@gentoo.org> quidscor-1.2.48.ebuild,
+  +files/quidscor-1.2.48-curl-types.h.patch, files/quidscor-1.2.48-strip.patch,
+  metadata.xml:
+  EAPI bump. Build fixes.
 
   15 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
   quidscor-1.2.48.ebuild:
diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest
index dbe7c2105ad7..a17e7b7b1f58 100644
--- a/net-analyzer/quidscor/Manifest
+++ b/net-analyzer/quidscor/Manifest
@@ -1,5 +1,16 @@
-AUX quidscor-1.2.48-strip.patch 330 RMD160 fba2e36ddf5867568b4e2a54e011451dc7e23d71 SHA1 37f8286c30cb4756b3a84ed044a7a1c84747243a SHA256 6dc21f84f0f612447bd91bbdf280789ba4fd4652b7c045f9f16de216c3d35540
-DIST quidscor-1.2.48-src.tar.gz 77843 RMD160 0cb83d5330be235884c748fcab40d4a04c24caa2 SHA1 0a0cca65c2abb1e5878743907561e390e06d4fc1 SHA256 619451c1501a2eeac3fbad14a3b7d21942a51368431f4c3c620ddf1f4c1faa2f
-EBUILD quidscor-1.2.48.ebuild 1009 RMD160 fcf9461249c241a3eaf7367166cebd3ca555712b SHA1 11ab5c83d6fac095d66bd7033437a3aee429b7a6 SHA256 0606c616e25e26504e25e8f9b15ef6013a4ff79ac5cbd45184e4e46fdd69ef5d
-MISC ChangeLog 1140 RMD160 1dcb6fff2fca25b8ca81731f4252e8b50fc2b5d7 SHA1 b4c52f9758b979806df8dd5ea01d8eda0ba067ab SHA256 f1b9f616da9221046b01210ca925e52bfea1671bb4ab49c0e0af905a6003c6e3
-MISC metadata.xml 220 RMD160 f6ac62ec80890fa9ac894584eb90ca1f51853b63 SHA1 b9bc32b2e5b7d9772b489a25d53cef529726d845 SHA256 ccab6cc7af041a744cdb5a8e47daba9af83cd288b0511315a732ec45f58f775b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX quidscor-1.2.48-curl-types.h.patch 226 SHA256 78c1ae49af67b5552b002d731544f5bebfc1549c5bcc5901953e30caccd016a9 SHA512 05034662e86afee3f33639c906485f65bcf7c020dab63ec467fcbcbfe7802b9459a5b34324019ebe46e04beb2a3706e45853f6a4e80e1b092c9926ffce1a7541 WHIRLPOOL 21206b39d58c3e6ae144ab746d06207d1a7758eadff62aa151abd6faedf27c8c52e72787638ac184e7a8d34e7b068cd3c3be1e7dbac24869e25d06d3ae2cdd2e
+AUX quidscor-1.2.48-strip.patch 225 SHA256 22889d09576fbe741aef77674a994b9d995d614c8c791e0539c4de1f044796c1 SHA512 aa74a95847acf7064cdd264da611f7d63b84f2c8d60f48facc77b0100a89412f93f9630841afd944681a780ff4a0f44526730fd30c860a60869e4869bf597965 WHIRLPOOL 5bd688f0a948f1a82dc0d2e006339705c2bf7166e438c2cc343167f7a7c90baac596945821ab51797e9218c45e01594fba72892feb2eaa8adee5d31784451818
+DIST quidscor-1.2.48-src.tar.gz 77843 SHA256 619451c1501a2eeac3fbad14a3b7d21942a51368431f4c3c620ddf1f4c1faa2f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010 WHIRLPOOL eb74036b5fde1981c04c0994d3e70c274d4c03f6bd16fd5c6d2528d0c181b10e9f92b1dc994e9e23d3e6a80df18130f4c9649b327d3e9f532060a446645871f6
+EBUILD quidscor-1.2.48.ebuild 1101 SHA256 f46e29fd96f17b69ab989a1ba7f632d358a9c3beae2d7c78a4b76ef3d99be7b9 SHA512 f543d01c68ae584692b5eecaadec0bef778ae1480af8d92665237603b2860d5d8e2ae24cc18ddabb4b7a127d9e05be2af0b49d61ea19423f646e1a0fc2393ce2 WHIRLPOOL b347b8e37db05c23d45166e272db45ef364021b0eaa97ddabd5329b3954eec1a01736c625f42e62aee94e669be3c5eb5cc8cbe5707f5433081a25392fba86696
+MISC ChangeLog 1328 SHA256 f5816bb860a0ab6d14e671fa87809bfac2703f4ca3a0ac4da836e64841a9bffa SHA512 21989f99966412d2c9f4beb16d909fd15c53968db838dcd2943ca2cc6447ea08683ecebdc0294606679b40126a74a3958a98f24b1c8f3a966f69a0948907c37a WHIRLPOOL 53b8d83056197e8f887f86a02e4d24f9e929db6f9c08c37db541f5bf8b1c8f123048002d6ad6a74a5caed24ac329aeee177712f0030f7b56a2b8f9bf947da207
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPLw8EACgkQVWmRsqeSphNTYQCfTVthG/0A+lEk1QN8/6pcEZuc
+d+sAnjI2ryqGqzw2q02lAzMMgSsAk3v0
+=kw1f
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
new file mode 100644
index 000000000000..5f1e035c81d6
--- /dev/null
+++ b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
@@ -0,0 +1,10 @@
+--- a/libqg/libqg.h
++++ b/libqg/libqg.h
+@@ -38,7 +38,6 @@
+ #include <arpa/inet.h>
+ #include <dirent.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <string.h>
+ #include <strings.h>
+ #include <libxml/xmlmemory.h>
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
index 9edd53e41ffe..9d169e619c0b 100644
--- a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
+++ b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
@@ -1,5 +1,5 @@
---- quidscor-1.2.48/Makefile.orig	2009-01-22 20:51:23.000000000 +0100
-+++ quidscor-1.2.48/Makefile	2009-01-22 20:52:29.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -69,7 +69,6 @@
  
  $(PNAME): $(PNAME).debug	 
diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml
index f9c033b48023..03aa50bab7e3 100644
--- a/net-analyzer/quidscor/metadata.xml
+++ b/net-analyzer/quidscor/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>IDS/VA Correlation engine</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/quidscor/quidscor-1.2.48.ebuild b/net-analyzer/quidscor/quidscor-1.2.48.ebuild
index 2bbb5baa7c25..54c57d4a864e 100644
--- a/net-analyzer/quidscor/quidscor-1.2.48.ebuild
+++ b/net-analyzer/quidscor/quidscor-1.2.48.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/quidscor-1.2.48.ebuild,v 1.8 2011/01/15 23:59:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/quidscor-1.2.48.ebuild,v 1.9 2014/07/20 13:27:27 jer Exp $
 
-inherit eutils
+EAPI=5
+inherit eutils toolchain-funcs
 
 DESCRIPTION="IDS/VA Correlation engine"
 HOMEPAGE="http://quidscor.sourceforge.net/"
@@ -11,30 +12,33 @@ SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE=""
 
-DEPEND=">=dev-libs/libxml2-2.4
+DEPEND="
+	>=dev-libs/libxml2-2.4
 	>=net-misc/curl-7.10
-	>=net-analyzer/snort-2.0"
+	>=net-analyzer/snort-2.0
+"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	sed -i '/^CFLAGS=/s: -g : :' ${S}/Makefile || die
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-curl-types.h.patch \
+		"${FILESDIR}"/${P}-strip.patch
+	sed -i '/^CFLAGS=/s: -g : :' Makefile || die
 	#yes, the fix below is as pathetic as it seems
-	echo "#define FALSE 0" >> ${S}/libqg/libqg.h
-	echo "#define TRUE 1" >> ${S}/libqg/libqg.h
-	epatch "${FILESDIR}"/${P}-strip.patch
+	echo "#define FALSE 0" >> libqg/libqg.h || die
+	echo "#define TRUE 1" >> libqg/libqg.h || die
 }
 
 src_compile() {
-	emake EXTRA_CFLAGS="${CFLAGS}" || die
+	emake EXTRA_CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake PREFIX=/usr STAGING_PREFIX=${D} install || die
+	emake PREFIX=/usr STAGING_PREFIX="${D}" install
 	dodoc ChangeLog FAQ MANIFEST README TODO
 	# fix ugly install
-	cd ${D}/usr
-	mv etc ..
-	rm -rf doc
+	cd "${D}"/usr || die
+	mv etc .. || die
+	rm -r doc || die
 }