EAPI bump. Build fixes.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 40 insertions, 22 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/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
 }