jer 14/07/20 13:27:27 Modified: quidscor-1.2.48.ebuild ChangeLog metadata.xml Log: EAPI bump. Build fixes. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.9 net-analyzer/quidscor/quidscor-1.2.48.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/quidscor-1.2.48.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/quidscor-1.2.48.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/quidscor-1.2.48.ebuild?r1=1.8&r2=1.9 Index: quidscor-1.2.48.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/quidscor-1.2.48.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- quidscor-1.2.48.ebuild 15 Jan 2011 23:59:27 -0000 1.8 +++ quidscor-1.2.48.ebuild 20 Jul 2014 13:27:27 -0000 1.9 @@ -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 @@ 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" - -src_unpack() { - unpack ${A} - sed -i '/^CFLAGS=/s: -g : :' ${S}/Makefile || die + >=net-analyzer/snort-2.0 +" +RDEPEND="${DEPEND}" + +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 } 1.9 net-analyzer/quidscor/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/ChangeLog?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/ChangeLog?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/ChangeLog?r1=1.8&r2=1.9 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ChangeLog 15 Jan 2011 23:59:27 -0000 1.8 +++ ChangeLog 20 Jul 2014 13:27:27 -0000 1.9 @@ -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 <j...@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_bon...@gentoo.org> quidscor-1.2.48.ebuild: 1.2 net-analyzer/quidscor/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/quidscor/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 10 Jul 2004 11:41:29 -0000 1.1 +++ metadata.xml 20 Jul 2014 13:27:27 -0000 1.2 @@ -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>