gentoo resync : 10.02.2019

4 files changed, 8 insertions, 80 deletions

diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index 0ea94683bdff..98bc65c61791 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -1,7 +1,5 @@
-AUX barnyard2.confd 1485 BLAKE2B 595580c6e765755c159b0e114475ccffe73b587714e9436a0c16c218d22eef3e6c1b197088fe233528cddb9d72c1fa3d279f69a992eac49bec5b6d519a1a5a3d SHA512 23bed3720bc832f110a3c6e8703f0e29c79491aa3bbfda112b49c6b822600d1e96bab0175dee6f133adcb44e1619d91f591fe5db10f458043c89f1948ecc25c2
+AUX barnyard2.confd 1487 BLAKE2B 0eaae6d5c5bd249c5033e404712b14b10eacb2ea7f638872927bd4e2fe5d005225e257bd5971597ae62db5a1f10da2d092e086eb60fb6ea3b552801f992d8646 SHA512 25fb327829da9f23a100e69310dd57c1f99404dd9923f2ef73d90635013ca68678122ee5f45f2e267c7b2f6264fd8e57998b1730d4ee02d3c2f61f1fe72d1f5f
 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423
-DIST barnyard2-1.9-r1.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
-DIST barnyard2-1.9.tar.gz 652879 BLAKE2B 958c926b26ff81c2baaf6993c1eafb10b48d1dc570b885f20f5893d64a56176f39ed5a872fb326d24b699406a0e60bbd1347df56612b5b85148505c72f6544ed SHA512 441a5751b28fd5c0aca73a78a58219a6ce58393e15bf735ae012719d1180e8e58a91d4170fe5c623bfe83de8ca0c04fb6975c8c7d5b6421ceedbf2023b44e72a
-EBUILD barnyard2-1.9-r1.ebuild 1773 BLAKE2B 03a20b1dcddbc7c641b7a7c548f832171c44d5892c3ed43e45b2218a37ae69c10b809a3ef0c5f28de43fa4dd4caae89cf4c5f5c43d586214ffbf8990ca60901c SHA512 20823ccd7a3d32c57e79495ea4a7c96b93e431d7f1b0e4f79accc6824917952bc4aca5565723c274b4ae7469b6525ca50a0f66d5e0188fd7f63c3c83c359621a
-EBUILD barnyard2-1.9.ebuild 1698 BLAKE2B 07fe6d8e7d696a9f94f992b28c2c397532c14c402967d2960a5a06dcdbf34b2cc058b512b8939f0f5683e8d2d2d4af2d151a3505c77837528381e605a3c83958 SHA512 0470caca3b6f1e2ee1013fcff6412907d854de6855c6f06df411cfea1fe8a864a50149274d4f47c826b5ef081e9d14440c01109be1acbf2e2bf8f4e317aa236a
+DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
+EBUILD barnyard2-1.9-r2.ebuild 1720 BLAKE2B b05ec48d30fc48ecd74d814790ec61df13c7e7d2b98e389859dfdf4a05642e7fd5bb9f47d3b9b8a587f9a6a154657cbbb925af2e493cb951e889239e3a4c28f0 SHA512 0d0967ce5498054f075d163e407d1d04741c2329cee2ab205e1d4990e5918ec63f4948e75456e8b9ae628e9206a95b0a3602473074d9ff2be3313788b6302fcd
 MISC metadata.xml 1266 BLAKE2B 00bb6b8c75617632fb4e89059005bcaf90e6f637a1227f6717a3d3d3f5957b17eee0936764ae5f74b37a76fd3681dfd87feed8858170ff8dc56a1683549bd028 SHA512 fcc818ef5d01ef3887994a1426e3ded3df4c8239e9b68edc6be943392252a072a42cd98dacb119fc568097e72d8dff0909bc3241e81314194290b40ae0f56b27
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}."
-}
diff --git a/net-analyzer/barnyard2/files/barnyard2.confd b/net-analyzer/barnyard2/files/barnyard2.confd
index d114f826c707..a924456555aa 100644
--- a/net-analyzer/barnyard2/files/barnyard2.confd
+++ b/net-analyzer/barnyard2/files/barnyard2.confd
@@ -33,4 +33,4 @@ CONF="/etc/barnyard2/barnyard2.conf"
 # This pulls in the options above
 BARNYARD_OPTS="-D -c ${CONF} -d ${SPOOL_DIR} -w ${WALDO_FILE} -f ${SPOOL_FILE} -l ${LOG_DIR}"
 # Or with an archive directory
-#BARNYARD_OPTS="-D -c ${CONF} -d ${SPOOL_DIR} -w ${WALDO_FILE} -f ${LOG_FILE} -l ${LOG_DIR} -a ${ARCHIVE_DIR}"
+#BARNYARD_OPTS="-D -c ${CONF} -d ${SPOOL_DIR} -w ${WALDO_FILE} -f ${SPOOL_FILE} -l ${LOG_DIR} -a ${ARCHIVE_DIR}"