gentoo resync : 02.03.2018

3 files changed, 2 insertions, 66 deletions

diff --git a/net-dialup/mwavem/Manifest b/net-dialup/mwavem/Manifest
index 256e7f3390e2..8a0d5419a338 100644
--- a/net-dialup/mwavem/Manifest
+++ b/net-dialup/mwavem/Manifest
@@ -4,6 +4,5 @@ AUX mwave.modules 30 BLAKE2B 6dd8f901ed35314e8ea4b6b1bc5e56943bb2d9f7ba5dccd9bd6
 AUX mwavem-2.0-gentoo.patch 1010 BLAKE2B 1a3d7126af9201bf8bcd2440f362b13a7037c8f4b3e6356f87103b2c315508b292d20946c87e93d8d939f19d95a9f781b3948c8caf0d003578fb8fe223f2eaaa SHA512 e0a97cfe59d7ecffc1199e9ad1380c9965546e554536747f593a69e0920f022e9667554fcb6633e1814163243b98ffc695ec25d98471d41b2e08ed112653dccf
 AUX mwavem-2.0-glibc-2.10.patch 1389 BLAKE2B 93073cdb8ef48b89b6f2603730d5a970e04202d1f249b1afeb3edbbde413fced88cfd31c2b56e0e9f981271a3830725047b98c1b3f9e8914460a730b5a86403a SHA512 a946530d607361c189d4cda8d8dcd3454caed695894dea8e7c25f53a2ae33a0e4684f738527f635eb0ddcbd238ce5007b9bd54c0c34f5b78d83d49ad530ba474
 DIST mwavem-2.0.tar.gz 1443167 BLAKE2B d70e3088b13a83f5dfd93690e67fa68497ef793b840fa3cba45efe4e72448abeba5312e0bbf1176825a62c366d47829ebd135461bf9600ba1b971b1db00a55e7 SHA512 e1bb3c7e5511abc784b0359b844498389a9cb970fe46752775aaae6146d8cf25998a6e12dfc70df5c5f4287fd57abb49252f81a00528db5f7c2c96e3e7efb516
-EBUILD mwavem-2.0-r1.ebuild 1560 BLAKE2B c69606cf58b548cad10b6746703b43b3ea1a04a9694b0ebb0e5c72e77f8f5ff9c144bdb6bdc3358c06ac4941471ec21f2401d67d983f2204623d5b9592163337 SHA512 7a086f08f7e7c3560df508ea0fd5edff0c536db655aa2c33d51bca5a7f589e726956c29214d6f5d932fee740329527d0808e16cd75dfa0c63f566ae87f60a57d
-EBUILD mwavem-2.0-r2.ebuild 1163 BLAKE2B dc1902a69781457c039d87efd73669bf9ba6c4e77b299afbf1b4f14feca506486be4e28d45ca92edd453da1110a9d76837f3e374d37ec9c9705a2baacb377159 SHA512 ce725fcc8840f1a8ec65d708e4cfb5af6c87ee52ad51704e4d29a6e75885d378d29dc8591c6612f35fdf28974caebebda63a29e64a6dd14da5960c4452acaf06
+EBUILD mwavem-2.0-r2.ebuild 1162 BLAKE2B b1e70d390d1d61066e7e1da9d301545d82db93339819c5cc73f08465951514412ca8ff546f2ad2b9ad1ebac38ec8de45ddc63b7df62f80eabc48d3397392f32f SHA512 901a041819af6daf5177141570273f75748c14d353d58bbcffcb115c82b025f6ffbab434886a4c8cc66c587bc239ce7c41e92927b830aad9ae6c08f00981c0d1
 MISC metadata.xml 245 BLAKE2B 7056c9f6265066dc7da276e30d63545a119cff18149d7dd89b1b0ee100eafe46d05d01b4048192cce57063e0cf4e4bd4c59678e74e62c96d6d9d01e004099047 SHA512 870dd73eec3bfd31c5545ebbce07fc74ccd06a1d44bad15d71858f756572f89e5af9387f3e207d08c1146c7397a325ce9d01497816d4d9bad6472d5a27b65c1f
diff --git a/net-dialup/mwavem/mwavem-2.0-r1.ebuild b/net-dialup/mwavem/mwavem-2.0-r1.ebuild
deleted file mode 100644
index 1ff1d46784f2..000000000000
--- a/net-dialup/mwavem/mwavem-2.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-AT_M4DIR="m4"
-
-inherit autotools eutils
-
-DESCRIPTION="User level application for IBM Mwave modem"
-HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
-SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dosbin "${FILESDIR}/mwave-dev-handler"
-
-	insinto /etc/devfs.d
-	newins "${FILESDIR}/mwave.devfs" mwave
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/mwave.modules" mwave.conf
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README README.devfs THANKS
-	docinto doc
-	dodoc doc/mwave.sgml doc/mwave.txt
-	dohtml doc/mwave.html
-}
-
-pkg_postinst() {
-	# Below is to get /etc/modules.d/mwave loaded into /etc/modules.conf
-	if [ "$ROOT" = "/" ]; then
-		[ -x /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update
-	fi
-
-	if [ -e "${ROOT}/dev/.devfsd" ]; then
-		# device node is created by devfs
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-	elif [ -e "${ROOT}/dev/.udev" ]; then
-		#the device should be created by udev
-		ebegin "Restarting udev to reread udev rules"
-			udevadm control --reload-rules
-		eend $?
-	else
-		[ ! -d "${ROOT}/dev/modem" ] && mkdir --mode=0755 "${ROOT}/dev/modems"
-		mknod --mode=0660 "${ROOT}/dev/modems/mwave" c 10 219
-	fi
-}
diff --git a/net-dialup/mwavem/mwavem-2.0-r2.ebuild b/net-dialup/mwavem/mwavem-2.0-r2.ebuild
index 33cba49517d7..c682b08f9ea8 100644
--- a/net-dialup/mwavem/mwavem-2.0-r2.ebuild
+++ b/net-dialup/mwavem/mwavem-2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README README.devfs THANKS )