gentoo resync : 10.11.2019

6 files changed, 59 insertions, 40 deletions

diff --git a/sys-apps/lcdutils/Manifest b/sys-apps/lcdutils/Manifest
index 5e60aaa135b3..b99dc2590bef 100644
--- a/sys-apps/lcdutils/Manifest
+++ b/sys-apps/lcdutils/Manifest
@@ -1,4 +1,5 @@
-AUX include-stdlib.h-for-exit.patch 1165 BLAKE2B 0a3f425a53c21a3613c5151e77836b254ce8aa8cf876703df3fbfb61310b5f223bce1e77f9d83c3512d18a5bc3f11e389433d1adfc2de5eb59e48f21ef782f98 SHA512 3356faefff0c258025bc76abcdb188a47558ed83c613be744fd5fd245f63fd5eb60417738d68c75971b5ad523e047b06c5969d0e8be28b9e9beb3aa4f7e667fd
+AUX lcdutils-0.2-include-stdlib.h-for-exit.patch 1165 BLAKE2B 0a3f425a53c21a3613c5151e77836b254ce8aa8cf876703df3fbfb61310b5f223bce1e77f9d83c3512d18a5bc3f11e389433d1adfc2de5eb59e48f21ef782f98 SHA512 3356faefff0c258025bc76abcdb188a47558ed83c613be744fd5fd245f63fd5eb60417738d68c75971b5ad523e047b06c5969d0e8be28b9e9beb3aa4f7e667fd
+AUX lcdutils-0.2-makefile.patch 446 BLAKE2B c268c67bf1ec0cba97b46ba12112103d81ad32e3463871539dfffd5cc6caf5422c1ebf4064604ed3adb0883b87b12c26f2bb0d8b08d3da33bdb9d6f708fc9538 SHA512 ee811308e5045eeee2f99536473294d9b7fec852b1d578dfb6c9fdaea0c250c2f59da740d9f6be52234ecb4cedbf38ff49886e388d350d93fd97ea92177c2dfd
 DIST lcdutils-0.2.tar.gz 10819 BLAKE2B ea493a49cc1d121b1edb848645f189b4996463e0616dc418e938658767cb56b4ca3982bda0d7349eb303b88ecd3015fa2d8c178607ad14311ca5a0af57a2305b SHA512 ea7140b7b27aade66d025b4c4c7441a2357d03f5081f67ccac8175e709e8f20bf800208a72675eacfca1af8329c01b9e8b1a9bd910bf858bcbdb8aff3c2169f4
-EBUILD lcdutils-0.2.ebuild 726 BLAKE2B 1fc03db86040605893b4ece1b582eb1d3b07d93ca7f377b11b4e7406ea971312efbfb7c883d0ab6e86671ef0e994470b60b99f6b983357a72bf6e5c9537aefef SHA512 62d09e49dcae09d2f34cc18c0e7e82e1a6d4df93996ccf55832f58e315157052cb0314fa3194d4eaf7eeb40cfec24d83f8372230d2012e390cfb4eb6bfd4c580
-MISC metadata.xml 375 BLAKE2B dc1da69c818d8740e699ffbe55df71b5d3728c0a3ccd47b2a87acc90e3026c2aa2cc5098eaf15da2dc4048b9d36a90933db295fab501fd70b7e04e6841dd47ec SHA512 db0267b82ae887ad69ba5196396d803b84344a6fc22aeb05341a80ffc6993e4538bf79d55f3d670d7947749a87de59eb4f1f0ed7c4a6cbcecf51e7feaed83502
+EBUILD lcdutils-0.2-r1.ebuild 525 BLAKE2B 6ed005f8034ab40c78b291e436573580c79344582c63821dfa128e1c4db6db9ade9a89b55ba7da6efcfa5b31d96468f8296dcbfda1e10aff9cd4ae59de33b0b3 SHA512 0feca5c9444e3812261be7a9d5feb22314cb7fc43282fb8c9205f7790fe3e94ad357f285e16284bf9c0c2d1c74d115838ee955b599da34b19ce649d57712032d
+MISC metadata.xml 621 BLAKE2B 4d425917eb908ab4412f462a205cbd7afdc5e723e7a7792c9f4285153c6dd2eea0f1a93e84240ea785dd1b0b96a2e389a9151b12cfffd2db4d1be5c9047d3753 SHA512 7ae20b14fc6b1186a82f543a5683d61e211004d651c8b558c7a374ae4bed2878fdc018a35b5b77d363ebf97b5f328929d2154231d14c2b5b0609e378af29c8cb
diff --git a/sys-apps/lcdutils/files/include-stdlib.h-for-exit.patch b/sys-apps/lcdutils/files/lcdutils-0.2-include-stdlib.h-for-exit.patch
index 81870496a529..81870496a529 100644
--- a/sys-apps/lcdutils/files/include-stdlib.h-for-exit.patch
+++ b/sys-apps/lcdutils/files/lcdutils-0.2-include-stdlib.h-for-exit.patch
diff --git a/sys-apps/lcdutils/files/lcdutils-0.2-makefile.patch b/sys-apps/lcdutils/files/lcdutils-0.2-makefile.patch
new file mode 100644
index 000000000000..a67db0c2e297
--- /dev/null
+++ b/sys-apps/lcdutils/files/lcdutils-0.2-makefile.patch
@@ -0,0 +1,20 @@
+--- a/Makefile	2002-07-08 15:31:37.000000000 +0200
++++ b/Makefile	2019-11-06 20:38:11.499806312 +0100
+@@ -1,13 +1,14 @@
+ #CC=mips-uclibc-gcc
+ #LDFLAGS=-static
+ 
+-CFLAGS=-O2 -Wall
++CFLAGS?=-O2 -Wall
+ 
+ all: putlcd buttond
+ 
+ install: all
+-	install putlcd /usr/local/sbin
+-	install buttond /usr/local/sbin
++	install -d ${DESTDIR}/usr/bin
++	install putlcd ${DESTDIR}/usr/bin
++	install buttond ${DESTDIR}/usr/bin
+ 
+ clean:
+ 	rm -f putlcd buttond *.o
diff --git a/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
new file mode 100644
index 000000000000..885e05c28b42
--- /dev/null
+++ b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="(Sun) Cobalt Qube/RaQ button reading and LCD writing utilities"
+HOMEPAGE="https://people.debian.org/~pm/mips-cobalt/"
+SRC_URI="https://people.debian.org/~pm/mips-cobalt/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~mips ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-include-stdlib.h-for-exit.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
diff --git a/sys-apps/lcdutils/lcdutils-0.2.ebuild b/sys-apps/lcdutils/lcdutils-0.2.ebuild
deleted file mode 100644
index 86daddae5bf8..000000000000
--- a/sys-apps/lcdutils/lcdutils-0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Cobalt RaQ/Qube LCD Writing and Button reading utilities"
-HOMEPAGE="http://people.debian.org/~pm/mips-cobalt/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~mips ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:CFLAGS=-O2 -Wall:CFLAGS=${CFLAGS}:g" Makefile
-	epatch "${FILESDIR}"/include-stdlib.h-for-exit.patch
-}
-
-src_compile() {
-	emake distclean || die "distclean failed"
-	emake all || die "all failed"
-}
-
-src_install() {
-	dobin buttond putlcd || die "dobin failed"
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/sys-apps/lcdutils/metadata.xml b/sys-apps/lcdutils/metadata.xml
index 14e7453a3b04..542e1c857301 100644
--- a/sys-apps/lcdutils/metadata.xml
+++ b/sys-apps/lcdutils/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
 	</maintainer>
-
 	<longdescription>
-		Provides utilities for Cobalt Microserver systems to write to the LCD and read button input
+		Provides utilities for the (Sun) Cobalt Microserver Systems
+		to write to the LCD and read the button input.
 	</longdescription>
 </pkgmetadata>