gentoo resync : 04.01.2018

10 files changed, 99 insertions, 93 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 06bf47d06146..46b028c0033c 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 9935a7e38437..992f9cdc619b 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -1,5 +1,6 @@
 AUX gentoo-alt.logo 1672 BLAKE2B 19cd7ac8cf29cb253cf2a2b44be7f369ac840f6f891e19bd550a2b6ae0c4098d10c28bad4003c83f7cae5a462f66d676393cd855e96dcd51d6234c86d72b8fda SHA512 7068100889469c489ec327fa1aaa9503c6b54b350b2d7786ad1cbd9bcafb92630220820defd01089d3dc52c7dab2c2f2787aef4361430f8dc97894b46f3d72de
 AUX gentoo-linux.logo 4788 BLAKE2B 3b130f25770a7d39c2a86bcb7c09aefb254721de7ebae629eb55faa2ccf435ee6bff147b7b230493e31c6f678e30746b21275e9eb7a93369076caa309dfdca45 SHA512 63f72473c05073258c47b0b24bc8dea4e7f3e4e060d8296ae31eee2dccb93c159ed473ef23924e96fa47a4796150e16c542908d55312a660ccf0696904962fbe
+AUX linux-logo-5.11-add-aarch64-support.patch 422 BLAKE2B 29b9163b930192d5fc83e549d5bf2e149e1a5d85aa6485fa3b60ca964d5e376c3d0f26cc63c3a28f6e1d85a3ecdb63594a48d3bc0726c7bb7aea4c8e676d0d6f SHA512 0af44f11d7aa4c96be50e77d65a966b56002a7b8903d5f109695e2151f7bde64a52645ba291b429dcfb7c5cb2cc2d29147e88ac0db4d1a2589e63427417d0133
 AUX linux-logo-5.11.conf 1225 BLAKE2B c84f6722843d01052a40b5270e816d35fad11423c5072107c5794aab14dceff6494659cc6a5ea381a905f571f87da599f6dd50a1325370de57534b67b5b0ec88 SHA512 b277fb20fb4db7420fad63f7412513f992471e64985d9e8f7ed4d3975fc9c5dac4ed777bc3b0cf6138bbab5a38c519ae75039bd89e42503b75e7d5ce191846d1
 AUX linux-logo.init.d 938 BLAKE2B 9760e591b1500a4776eaf1f24eb0903dc6d1a21102c2cf45373ab3a7f104ae87bfd31476c5bed7be32119a36764986f0de98f9a3eeb0d4bd6a750109adbd0b2e SHA512 0c021418a4e7e31df3aada8bd3c7cebd97f8e812d086a45aaff5d5779650195e92e87072a3627a3bb50384f10fccafd78cd966c8daed6775bbe58f6305e6db53
 AUX linux-logo.service 155 BLAKE2B 706487d4b0a266d563bf427996ba15775a6e317d77a71d1e7c359499617a2065e74f500884736e8becc3fa64907feff8a06b2644c1337e295d3f24383b47c7ff SHA512 01b5917d1a7a70faa2622e459f4e27b5e23f15481ac94cae51ee39799d15f783a6427c7430067208a7a73e6f270527c1e64740c6eb31ce0f17a4777343bc3261
@@ -7,4 +8,5 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
 EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
+EBUILD linux-logo-5.11-r4.ebuild 2265 BLAKE2B 391f663a53b1ecb154a094262952f1442278964d3b6ba970ce341bd5700739c7fe959a6c356e8261a10321cf67cc4b2f86cb7812fe732ceaeaa3fb7fa0c31a11 SHA512 880d1acfedf80af82dcec3a35b1ab2a304a6b37c94a562941bc75fb432ed6dfbac78ea470ff285b48420946ace19d70792ad06d7be906eac2d70384f89117e02
 MISC metadata.xml 487 BLAKE2B 25ad355aac4b4da399514cf9045159f13a93b47ddf26fc8bf6a75aa6f4ab5a300b0a11d50df5458b7be57a735005de2ce82292807163c71c448d2a3e092322dc SHA512 bbc83554665f6466c688c8e2fc432c30e26cab8193f70c0cd47965a9f603a2284b0e9c147dd486ead65207133655d31fb4919eecd6bb72079290e46a677a6c5e
diff --git a/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch b/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch
new file mode 100644
index 000000000000..8ea15ebab6ac
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch
@@ -0,0 +1,13 @@
+diff -Nuar a/libsysinfo-0.2.2/Linux/Makefile b/libsysinfo-0.2.2/Linux/Makefile
+--- a/libsysinfo-0.2.2/Linux/Makefile	2010-02-15 18:15:07.000000000 +0100
++++ b/libsysinfo-0.2.2/Linux/Makefile	2018-01-03 20:16:48.299998620 +0100
+@@ -6,6 +6,9 @@
+ ifneq (,$(findstring arm,$(ARCH)))
+    ARCH := arm
+ endif
++ifneq (,$(findstring aarch64,$(ARCH)))
++   ARCH := arm
++endif
+ ifneq (,$(findstring sh,$(ARCH)))
+    ARCH := sh
+ endif
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
new file mode 100644
index 000000000000..22aa370e8017
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs systemd
+
+MY_P=${PN/-/_}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	cp "${FILESDIR}"/logo-config "${S}/logo_config" || die
+	cp "${FILESDIR}"/linux_logo_creator "${S}/" || die
+	cp "${FILESDIR}"/linux-logo.service "${S}/" || die
+	cp "${FILESDIR}"/gentoo-*.logo "${S}"/logos/ || die
+
+	eapply "${FILESDIR}"/"${P}"-add-aarch64-support.patch
+	# Remove warn_unused_result warning
+	sed -i -e 's/FILE \*fff;/FILE \*fff;\n   char *stemp;/' \
+	    -e 's/fgets/stemp=fgets/' "${S}"/load_logo.c || die
+	eapply_user
+}
+
+src_configure() {
+	ARCH="" ./configure --prefix="${ED}"/usr || die
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install
+
+	dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
+
+	dobin "${FILESDIR}"/linux_logo_creator
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newconfd "${FILESDIR}"/${P}.conf ${PN}
+
+	# systemd support
+	systemd_newunit "${FILESDIR}/linux-logo.service" "linux-logo.service"
+}
+
+pkg_postinst() {
+	echo
+	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
+	elog ""
+	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
+	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
+	elog "To display all the logos available type: linux_logo -L list."
+	elog ""
+	elog "To start linux_logo on boot, please type:"
+	elog "   rc-update add linux-logo default"
+	elog "or for systemd"
+	elog "	 systemctl enable linux-logo.service"
+	elog "which uses the settings found in"
+	elog "   /etc/conf.d/linux-logo"
+	echo
+}
+
+pkg_prerm() {
+	# Restore issue files
+	mv /etc/issue.linux-logo.backup /etc/issue 2> /dev/null
+	mv /etc/issue.net.linux-logo.backup /etc/issue.net 2> /dev/null
+}
diff --git a/app-misc/ondir/Manifest b/app-misc/ondir/Manifest
index 3eeb44f9ae7d..4044838face7 100644
--- a/app-misc/ondir/Manifest
+++ b/app-misc/ondir/Manifest
@@ -1,4 +1,3 @@
 DIST ondir-0.2.2.tar.gz 20138 BLAKE2B 3724b8d356cec16e1f60ec49574e2f688d4f7456f48f1d909402e8436f588d9617c827eda9a74c1b930d2538fe8c9d1372a1d222124d8f7b863bf8e895cfaa25 SHA512 5c2c53532934b25d2a170c619d067c369b6acf2ef3e0a87607619613dcc0bbfc570937fb91cdc5df3f22ae0453b5a5d00edd57cd1b852f7a076c15b96c45d4dd
-EBUILD ondir-0.2.2-r1.ebuild 975 BLAKE2B 5d9074434ac4b378ead3345a37e2b481a8367d8764d2bf8664c7fa3fbd3c818fee9397d36c4edb9a7682aa68d40e3f2dbc7965ad03efe5fb51bb4d571277da5f SHA512 48e3830ad786995a135ecbdf4023bff87778c82f025965789bfcb6d645a3f8445beaeaab3b74a0a0d43ee8b711e3b4d0823c42257cd7c486d773e9298f141013
-EBUILD ondir-0.2.2-r2.ebuild 986 BLAKE2B dff0fdca5cd268b720551b73ce0941f58cfc01024d3a031f1a6bbeecf60b786338bb985645a1143040adb16f15f63cff6f3121a13c0205bef32e736457bba0cc SHA512 c88c2072211afb448140b6b252c7626502d2516e902b22f71692c8db00318f7154879d4f86313dec2c18866073c4028b5fbf02f3ecb86ec946834c846793e145
+EBUILD ondir-0.2.2-r2.ebuild 983 BLAKE2B 1ad1bf96ffea8060f6a676183d5c200165e928cbf46e5a4ddc2dfdd342e150c53bc9375a8413fae34a2a0af147a34ab1cac6caa19b3858e0ae33e85bbeb4e8b6 SHA512 4da1bcf80437796ea0c427f3be610c406880ff76e2d59c651078ab86917c3a06ad3e1b5b017836d499a7cd3ad1095ea9a5308def391764c78dc042063b1af7fe
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/ondir/ondir-0.2.2-r1.ebuild b/app-misc/ondir/ondir-0.2.2-r1.ebuild
deleted file mode 100644
index 58c113acfb4b..000000000000
--- a/app-misc/ondir/ondir-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Automatically execute scripts as you traverse directories"
-HOMEPAGE="http://swapoff.org/OnDir"
-SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "s:\(/man/.*$\):/share\1:g" \
-		-e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX}/usr" \
-		CONF="${EPREFIX}/etc/ondirrc" \
-		LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" CONF="${EPREFIX}/etc/ondirrc" install || die
-	dodoc AUTHORS ChangeLog README INSTALL scripts.tcsh scripts.sh || die
-	newdoc ondirrc.eg ondirrc.example || die
-	dohtml changelog.html ondir.1.html || die
-}
diff --git a/app-misc/ondir/ondir-0.2.2-r2.ebuild b/app-misc/ondir/ondir-0.2.2-r2.ebuild
index d483901c75fa..59d6874ad10e 100644
--- a/app-misc/ondir/ondir-0.2.2-r2.ebuild
+++ b/app-misc/ondir/ondir-0.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="sys-apps/sed"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/splitvt/Manifest b/app-misc/splitvt/Manifest
index 889d739ba604..a0c2ee67b021 100644
--- a/app-misc/splitvt/Manifest
+++ b/app-misc/splitvt/Manifest
@@ -1,6 +1,5 @@
 AUX 1.6.6-ldflags.patch 1048 BLAKE2B 0e67a86bf33ffb3513263f58ec8ad9d7764af054eef60c5c5d1169cbf0d6e142db79b81c9e1faf4f374866ddc0f7201846c3eba4a99ef316eac5c5371f86d106 SHA512 032092bdd9c99917a7a446f4dc66f3fd4d91329eee9992d3026525c969d6a01420eb9131bf51bb92afe79bf2e194ad9ac039e16ac168686b7e534591cfe90307
 DIST splitvt-1.6.6.tar.gz 64797 BLAKE2B cc867fe7cf57b541f5d124bb3bbac111e0cd4a4ef835df7c8abfc7e73c1d172f0a75512e54245b395d815308b6bf94d79c8b896099a4af51e8947ddf177e88bc SHA512 a0a0ea2251489f14e2ba7af9bb1b9d309d6fa310f434090d97af2a0805c398731dec45a5cc15c2074af4d3f33b02c5bab019743530619755382af80ff86fa670
 DIST splitvt_1.6.6-7.diff.gz 11073 BLAKE2B 595381265ecd1d7a654fbce4afde5f872e7ce35d3cd44936f78a3c714b7964586d7ec0ec17d986a0f2e6ff9c3e01cf3563b54185f2fa10bebc9ababd174d4879 SHA512 620f3f6e7f22284ef8054e371a87421beeb2ef355b7084748cbd1f7a3a128c9da11f291fdaf1d393010c0f7affce8d6e56a7ae0977d9831b9d3b98963c55c71f
-EBUILD splitvt-1.6.6-r2.ebuild 1186 BLAKE2B 77afd27128bf72eda6bb033e1fdc953f568aa1bde5265702eb28ce00f95e23821f50365796e5808521097d88f060817751f7aa26c5733bbaa9e8bb691996349d SHA512 34f836a3a8ff35ce55e9bc7d2d455d197415fc1f608491d3e3812e3875a669e742fb078f833083c8f58d1d20e8fc3cf4218f1e3f020622a6872b8e070c65326f
-EBUILD splitvt-1.6.6-r3.ebuild 1134 BLAKE2B d57d94d4165ce3c3bb2c2b930c9e27973c5bf55fbcc064ec67e80f06cf9f52b2f7e28d74a0a715b8cb32b046896e43c59b161babd0208658112cdc2a8f8d32b2 SHA512 40221834d1373699c1d811dbb3490afc1f178a8f95981a3cb6b0d52b13c4de5c93587caaaed63ac2b1404e20092f5b3cd003bcb3703e56a1c4a5300eaffdf617
+EBUILD splitvt-1.6.6-r3.ebuild 1129 BLAKE2B 0192ef04acb5ca1dc0108305b0052f538d9234754861ae69e21ab4abcdad9b359e2d342e5c91cce00ca8b26ad998f89eb1b632f30a687eddc771e22777dced2f SHA512 b1a7e949cbf81b2424f1788b3d638aadc042b57cf6bca7a161cf4536aa76faa881ab81a779d732900bd738febf64916e61a390c500abc41265dc265a16406284
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/splitvt/splitvt-1.6.6-r2.ebuild b/app-misc/splitvt/splitvt-1.6.6-r2.ebuild
deleted file mode 100644
index a007ffa4eeab..000000000000
--- a/app-misc/splitvt/splitvt-1.6.6-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/-/_}"
-DEB_PL="7"
-
-DESCRIPTION="Splitting terminals into two shells"
-HOMEPAGE="http://www.devolution.com/~slouken/projects/splitvt"
-SRC_URI="
-	http://www.devolution.com/~slouken/projects/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/s/splitvt/${MY_P}-${DEB_PL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${MY_P}-${DEB_PL}.diff \
-		"${FILESDIR}"/${PV}-ldflags.patch
-	sed -i \
-		-e "s:/usr/local/bin:${D}/usr/bin:g" \
-		-e "s:/usr/local/man/:${D}/usr/share/man/:g" config.c || die
-}
-
-src_configure() {
-	# upstream has their own weirdo configure script...
-	./configure || die "configure failed"
-	sed -i -e "s:-O2:${CFLAGS}:" -e "s:^CC = gcc:CC = $(tc-getCC):" Makefile || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1/ || die
-	make install || die "make install failed"
-	fperms 755 /usr/bin/xsplitvt || die
-	dodoc ANNOUNCE BLURB CHANGES NOTES README TODO || die
-	doman splitvt.1 || die
-}
diff --git a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
index 6fe1ef463d0a..e28504982b78 100644
--- a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
+++ b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ia64 ppc sparc x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"