net-analyzer/barnyard2: Revbump to fix dependencies

Non-maintainer commit

Closes: https://bugs.gentoo.org/665936
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight@gentoo.org>

3 files changed, 5 insertions, 76 deletions

diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index d7670b3accd9..90318b00cc39 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -1,2 +1 @@
-DIST barnyard2-1.9-r1.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
-DIST barnyard2-1.9.tar.gz 652879 BLAKE2B 958c926b26ff81c2baaf6993c1eafb10b48d1dc570b885f20f5893d64a56176f39ed5a872fb326d24b699406a0e60bbd1347df56612b5b85148505c72f6544ed SHA512 441a5751b28fd5c0aca73a78a58219a6ce58393e15bf735ae012719d1180e8e58a91d4170fe5c623bfe83de8ca0c04fb6975c8c7d5b6421ceedbf2023b44e72a
+DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
diff --git a/net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild
index 8bd23af30787..e936e8d53c18 100644
--- a/net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild
+++ b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Parser for Snort unified/unified2 files"
 HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects"
-SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${PF}.tar.gz"
+SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug gre mpls mysql odbc postgres static"
 
 DEPEND="net-libs/libpcap
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	odbc? ( dev-db/unixODBC )
 	postgres? ( dev-db/postgresql:*[server] )"
 RDEPEND="${DEPEND}"
@@ -58,11 +58,7 @@ src_install () {
 	newconfd "${FILESDIR}/barnyard2.confd" barnyard2
 	newinitd "${FILESDIR}/barnyard2.initd" barnyard2
 
-	dodir /etc/barnyard2 \
-		/var/log/snort \
-		/var/log/snort/archive \
-		/var/log/barnyard2
-
+	dodir /etc/barnyard2
 	keepdir /var/log/barnyard2
 	keepdir /var/log/snort/archive
 
diff --git a/net-analyzer/barnyard2/barnyard2-1.9.ebuild b/net-analyzer/barnyard2/barnyard2-1.9.ebuild
deleted file mode 100644
index e09f129def05..000000000000
--- a/net-analyzer/barnyard2/barnyard2-1.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="Parser for Snort unified/unified2 files"
-HOMEPAGE="http://www.securixlive.com/barnyard2/"
-SRC_URI="http://www.securixlive.com/download/barnyard2/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="static debug gre mpls mysql odbc postgres"
-
-DEPEND="net-libs/libpcap
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql[server] )
-	odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:^#config interface:config interface:" \
-		"${WORKDIR}/${P}/etc/barnyard2.conf" || die
-	sed -i -e "s:^output alert_fast:#output alert_fast:" \
-		"${WORKDIR}/${P}/etc/barnyard2.conf" || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable debug) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--disable-ipv6 \
-		--disable-prelude \
-		--disable-mysql-ssl-support \
-		--disable-aruba \
-		--without-tcl \
-		--without-oracle || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	newconfd "${FILESDIR}/barnyard2.confd" barnyard2 || die
-	newinitd "${FILESDIR}/barnyard2.initd" barnyard2 || die
-	dodir /etc/barnyard2 \
-		/var/log/snort \
-		/var/log/snort/archive \
-		/var/log/barnyard2 || die
-	dodoc RELEASE.NOTES \
-		etc/barnyard2.conf \
-		doc/README* \
-		schemas/create_* || die
-	rm "${D}"/etc/barnyard2.conf || die
-}
-
-pkg_postinst() {
-	elog "Configuration options can be set in /etc/conf.d/barnyard2."
-	elog
-	elog "An example configuration file can be found in /usr/share/doc/${PF}."
-}