[gentoo-commits] repo/gentoo:master commit in: app-admin/filebeat/files/, app-admin/filebeat/

[Joonas Niilola]

commit:     ff85244f7e54995f63bdaf2ffd87d2a679501aff
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Oct 25 16:44:23 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 06:53:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff85244f

app-admin/filebeat: drop old

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13436
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-admin/filebeat/Manifest               |  5 ---
 app-admin/filebeat/filebeat-6.3.2.ebuild  | 66 ------------------------------
 app-admin/filebeat/filebeat-6.4.3.ebuild  | 66 ------------------------------
 app-admin/filebeat/filebeat-6.5.4.ebuild  | 66 ------------------------------
 app-admin/filebeat/filebeat-6.8.1.ebuild  | 67 -------------------------------
 app-admin/filebeat/filebeat-6.8.3.ebuild  | 67 -------------------------------
 app-admin/filebeat/files/filebeat.initd   |  2 +-
 app-admin/filebeat/files/filebeat.initd.1 |  2 +-
 8 files changed, 2 insertions(+), 339 deletions(-)

diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index bb36b2b1661..865b940ffaa 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,10 +1,5 @@
 DIST filebeat-5.6.13.tar.gz 18212575 BLAKE2B a0b8810523cecd1c6c87a69832c92b39fdc4cbe199eeae3c837f60b5057915e4d1ffb0fd371b3296cea398a11135b9d8da147451997514c85447722d086b8739 SHA512 fd572666858f1aeeede9e1b2074668d0bd691f58d51acd7955a3203b27d3ee850784a39e47941a570a833926a4109645eb98c24b49263276d1df475578c17efa
-DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
-DIST filebeat-6.4.3.tar.gz 22085261 BLAKE2B 466580ba371d02bd0b51bd80f0e8d9766f2af1d371f88cd01144a648cd8d5488ca54447e925e9014790a836009d76be9eec9ef9b14a102287d3f4a71b852d20d SHA512 c28d9939c2082b586ddf744b4e18427096290987efd74f7ea03d2632a1cdcbc5dd2b043ee7ceeb0457098faeb52abbac57652077c518112fb65858954ee27f34
-DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351739569f5570daac3e321963e98190331c5bf99c2451db5faa615620e023d2fd9c73060d4d775392a86a2f5578d80 SHA512 a48b9ae267ec80c1b45e4e07644f8080f8ba280da5c3543022b73472eb70de9d836cfffd387e576298becf9313d2cfa67d835158442f163b1a1bd0e72df31297
 DIST filebeat-6.6.1.tar.gz 29108620 BLAKE2B 21dbe189dcf91efe6170574e3cff858cca4094936fbda54a343f66e61a5f0cd7d29e71d547c34ddd78776283d13e48926dd84925eed58ca07cc7bedf216c9064 SHA512 9c7646efa8aa44c2ae1cbcf85204749bc57491aad075d3ca283cd75a1b3a93d922169603407b2ea111e7e3abe0a43ce26fabccfe93d56a4232bd63e2b2e8b24a
-DIST filebeat-6.8.1.tar.gz 35550017 BLAKE2B 0a1913adf2eda50884f33715a059fcc2028e31560afc5412e87d7fd3a6ed5cc504683ad3c5b28f18df24afd3e4c8d96c5b2a930411ae32d09d05c85cfdff0499 SHA512 5ff047e80099b09e25952ac7fc8ea0c6be25df2cd3b638c07c600e680fac32505c279a3a91ee2e61acf0f9535b4adb390a65f3a7dbc3599e74c6b02e0aa6ef71
-DIST filebeat-6.8.3.tar.gz 35551301 BLAKE2B ec33f0a5812e355bf2a9212daff999dfed869cd07b20ed9a8fa7c94c76e6fda291a137c5c601d9317ce3e1a34e06be241c1ce7c148f7b6e181903f88c6b1a410 SHA512 49cea2f95429feb311a15b9f247a0c627409edb1badd09d629d37a28994301e69526d5156bce72c9ed65079815f58bca41202862321edc46315e649395293632
 DIST filebeat-6.8.4.tar.gz 35552503 BLAKE2B 165edceffa71318d77363e4e8e737663eb45e5c3d20148dffd8111187eb3d07eb7998c068b3a3da315ff582f7687d75183ae9828f8b9c87d0c025d450936e00d SHA512 4739481a2ec0307804b797369050b81668f531793bdd1c72304b963e8ab4662b40820dfab211c7fdeeef5deb431f5a0e6ef2680841b4748d352ee8724b2bac42
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
 DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a

diff --git a/app-admin/filebeat/filebeat-6.3.2.ebuild b/app-admin/filebeat/filebeat-6.3.2.ebuild
deleted file mode 100644
index 1c9264bf6ec..00000000000
--- a/app-admin/filebeat/filebeat-6.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10.3"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}

diff --git a/app-admin/filebeat/filebeat-6.4.3.ebuild b/app-admin/filebeat/filebeat-6.4.3.ebuild
deleted file mode 100644
index 8a81429845c..00000000000
--- a/app-admin/filebeat/filebeat-6.4.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10.3"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}

diff --git a/app-admin/filebeat/filebeat-6.5.4.ebuild b/app-admin/filebeat/filebeat-6.5.4.ebuild
deleted file mode 100644
index 9c0c5d215f4..00000000000
--- a/app-admin/filebeat/filebeat-6.5.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11.2"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}

diff --git a/app-admin/filebeat/filebeat-6.8.1.ebuild b/app-admin/filebeat/filebeat-6.8.1.ebuild
deleted file mode 100644
index 36a7f617b67..00000000000
--- a/app-admin/filebeat/filebeat-6.8.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.5"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}

diff --git a/app-admin/filebeat/filebeat-6.8.3.ebuild b/app-admin/filebeat/filebeat-6.8.3.ebuild
deleted file mode 100644
index 0c71f0e0843..00000000000
--- a/app-admin/filebeat/filebeat-6.8.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}

diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
index 92b8369a41d..1d9a987c87b 100644
--- a/app-admin/filebeat/files/filebeat.initd
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 FILEBEAT_USER="${FILEBEAT_USER:-root}"

diff --git a/app-admin/filebeat/files/filebeat.initd.1 b/app-admin/filebeat/files/filebeat.initd.1
index 2cb33ba8ebc..3bad7654d34 100644
--- a/app-admin/filebeat/files/filebeat.initd.1
+++ b/app-admin/filebeat/files/filebeat.initd.1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 FILEBEAT_USER="${FILEBEAT_USER:-root}"