gentoo resync : 19.01.2018

3 files changed, 32 insertions, 45 deletions

diff --git a/dev-libs/legousbtower/Manifest b/dev-libs/legousbtower/Manifest
index 080fe1f1ecd7..e07a7693eff6 100644
--- a/dev-libs/legousbtower/Manifest
+++ b/dev-libs/legousbtower/Manifest
@@ -1,4 +1,4 @@
 AUX 20-lego.rules 83 BLAKE2B ac95969960bb86f3b5e18d7c9c00b49e4ecb2fb850f1481ca290de12e76eb3b14d0b4ddf225f569c8a8005bbf5a557590a63d9c7fc1881e2e6884a30e75d91c9 SHA512 1e708d5c5d1169075c6ba626cfb362e473e4d026c8ced32f888eb6874637bf7d655917b08f15738cb53eb4be78f8c243c795293862d109683e895507f30dfc61
 DIST legousbtower-0.5.4.tar.gz 22782 BLAKE2B a77f1e2fbadc7b7ecc93ce1726d4dbc47048cdf9edb7627cc08a4fb571657b0e601f7cd9b7a8026892a596ffaf8c3c9d26e4074c7aef57a78964087e905e38de SHA512 169cf31d4585bf3b7bd9aded76d202bb14e285f644f8aa10a6f4bf6d99e6f28efc33c65922388cdfa17a1bfc0dbc777edc1fb45484155543a42117eaba6fb7e7
-EBUILD legousbtower-0.5.4.ebuild 1030 BLAKE2B 719627cce340cd5a3bcd2e2808456f93904b05a131176b16ecc5bf3f6ca96a7c78de6789337ace60025df0f70259bef724434a5a671b3c9b7b56dd34d0cb53f5 SHA512 45eff32b73b9fc3d6517172f52dadea70646fdc45da19070ecc8a39c335fc1411ad73e5dee57e74e9ea46921253553e254af52cefedff8a7948209e08374088d
+EBUILD legousbtower-0.5.4-r1.ebuild 734 BLAKE2B 67d528bfea0082bc1f2f83062f1db75d12e891fa1a3a6d818951acf0534147d6f448dab3a94e18f46088ea833e673e71452302cea1a14f40427c50c1336ea94a SHA512 43b4d1e9cbc7b7989d1a93d8f4cf5ed25b08d00304dbc2d86f0f9cd8d4cb99898f78da3063418a05f96bd887ed43edf3bad57700b6746a52d42077fa5de7d633
 MISC metadata.xml 244 BLAKE2B 9eceb013695379bbfd076331cd25d5c86c334913652e1f634b1b9dea98d36fa9e9a70e40606f45dffc0c437b96c3213cc446f6d460839d9b87440bb1e984b7c6 SHA512 dd104cf292c56e0c1faced64aec00bd8668ee8925116d795a47b3e1fd88f5a743ec64111e4095b9afbaa2823c20bcb5100bf1ffb5d17e5a19389112249a835a6
diff --git a/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild b/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..51fdecaf027b
--- /dev/null
+++ b/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit udev
+
+DESCRIPTION="The lego mindstorms usb tower headers and/or modules"
+SRC_URI="mirror://sourceforge/legousb/${P}.tar.gz"
+HOMEPAGE="http://legousb.sourceforge.net/"
+
+SLOT="0"
+LICENSE="MPL-1.0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/include/LegoUSB
+	doins include/legousbtower.h
+	udev_dorules "${FILESDIR}"/20-lego.rules
+	dodoc README
+}
+
+pkg_postinst() {
+	elog "This package only provides the header file."
+	elog "You need to enable the lego usb tower option in the kernel."
+	elog "The kernel 2.4 module is no longer built or supported"
+}
diff --git a/dev-libs/legousbtower/legousbtower-0.5.4.ebuild b/dev-libs/legousbtower/legousbtower-0.5.4.ebuild
deleted file mode 100644
index 4f09ec70ef7f..000000000000
--- a/dev-libs/legousbtower/legousbtower-0.5.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit linux-mod
-
-DESCRIPTION="The lego mindstorms usb tower headers and/or modules"
-SRC_URI="mirror://sourceforge/legousb/${P}.tar.gz"
-HOMEPAGE="http://legousb.sourceforge.net/"
-
-SLOT="0"
-LICENSE="MPL-1.0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_compile()
-{
-	if [ ${KV_MINOR} -eq 4 ] ; then
-		econf || die "Configuration failed"
-		emake || die "Compilation failed"
-	fi
-}
-
-src_install() {
-	if [ ${KV_MINOR} -eq 4 ] ; then
-		einstall || die "Make Install Failed"
-	else
-		insinto /usr/include/LegoUSB
-		doins include/legousbtower.h
-		insinto /lib/udev/rules.d
-		doins "${FILESDIR}"/20-lego.rules
-	fi
-	dodoc README
-}
-
-pkg_postinst() {
-	if [ ${KV_MINOR} -eq 4 ] ; then
-		elog "You are using the 2.4 kernel series."
-		elog "These are unsupported."
-	else
-		elog "You are using the 2.6 kernel series."
-		elog "This package only provides the header file."
-		elog "You need to enable the lego usb tower option in the kernel."
-	fi
-}