gentoo resync : 22.10.2018

4 files changed, 30 insertions, 76 deletions

diff --git a/media-libs/libtxc_dxtn/Manifest b/media-libs/libtxc_dxtn/Manifest
index 0a4c839e9980..425a83073a6f 100644
--- a/media-libs/libtxc_dxtn/Manifest
+++ b/media-libs/libtxc_dxtn/Manifest
@@ -1,4 +1,3 @@
 DIST libtxc_dxtn-1.0.1.tar.bz2 214038 BLAKE2B a342bda7375dcbd4001adb5469c90a043fa039bc2505c9cf717613054b494fea9054136b25ac80b016c62aec248085a60ab5e71190cd5c2d90941bdda6408d16 SHA512 56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479
-EBUILD libtxc_dxtn-1.0.1-r1.ebuild 888 BLAKE2B 4036b3d209131cb43495b342701142c745d9943ffd008f2a47e9b70bf1a77b3e870768ea98cdba83bcd3d77a9c754f9f3bccaae7d64c4344cac5babd5c2f87f7 SHA512 aa78415fc9c1bc06f8dbda9413dddb1b8d2ba7fc624cdba37e306db49bc87ff3112a06557aead9417f4a26bf9cf37857048165e2a8af6fc5823e341bdc2627a6
-EBUILD libtxc_dxtn-1.0.1-r3.ebuild 970 BLAKE2B 7b461ab1cb74f21fb4eda25ba7826b863d34990184bb3168b4492735b1e67327b1d54d90481a702703645b5c9af049b40b5367897627fb19b15742f3f4c4ceba SHA512 343a4d26aeaf14559810f94c929d8407385c70ae5890c94f06d4ff83541d0b906f9c3fc620c5c2671c1fc386d2ddc49912bcab132d2157dca6466a911ea2a66e
+EBUILD libtxc_dxtn-1.0.1-r4.ebuild 633 BLAKE2B 4358733b08ef1ce6602181a12f308e7b1b2719f2db7e3f07b6fa160c52c4ce207c0c1c7188ee3881a0ad10ba0e3e2d47d91ea23f196425f5dca935fd6ee7b575 SHA512 bfe27812486322690fd926587e69d6d3e7668c30350546f854d3ee982d9961da6ffb9c651b375703db3da9608db2bd607cd5adca78f542438d0321e1ef654c03
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild
deleted file mode 100644
index 33b3c218982d..000000000000
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Helper library for	S3TC texture (de)compression"
-HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
-SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa"
-DEPEND="${RDEPEND}"
-
-RESTRICT="bindist"
-
-src_install() {
-	autotools-multilib_src_install
-
-	# libtxc_dxtn is installed as a module (plugin)
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	ewarn "Depending on where you live, you might need a valid license for s3tc"
-	ewarn "in order to be legally allowed to use the external library."
-	ewarn "Redistribution in binary form might also be problematic."
-	ewarn
-	ewarn "You have been warned. Have a nice day."
-}
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
deleted file mode 100644
index e44c81b33584..000000000000
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="Helper library for	S3TC texture (de)compression"
-HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
-SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-RESTRICT="bindist"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install_all() {
-	default
-
-	# libtxc_dxtn is installed as a module (plugin)
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	ewarn "Depending on where you live, you might need a valid license for s3tc"
-	ewarn "in order to be legally allowed to use the external library."
-	ewarn "Redistribution in binary form might also be problematic."
-	ewarn
-	ewarn "You have been warned. Have a nice day."
-}
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
new file mode 100644
index 000000000000..f520acc99906
--- /dev/null
+++ b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Helper library for	S3TC texture (de)compression"
+HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
+SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="media-libs/mesa"
+RDEPEND=""
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	default
+
+	# libtxc_dxtn is installed as a module (plugin)
+	find "${D}" -name '*.la' -delete || die
+}