gentoo resync : 26.12.2017

7 files changed, 48 insertions, 70 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f928ac9328a7..e08f9acbf51f 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index d4134bde429c..8e89dd1deb59 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -1,6 +1,4 @@
 AUX 1.0.5-Makefile.patch 1034 BLAKE2B 54c932527ba2eb9cfc9906571ab4e683e854359b677ef454e674e79bcb71ef2a28679f523785ad4eceab767fb976cc4a2388cbecca5e715aa21f6f5a9ae245aa SHA512 a0416ee6b6b7416d9f0f1d379b2b4a86fb0b0ca6df2dd5f0bf3d4e54ba1fa3213da1561a38b1757d2f98b4cf96df1ff74cdea1b7e05587c7250d77353f522832
 DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
-EBUILD countrycodes-1.0.5-r1.ebuild 779 BLAKE2B 3ed03fcf595652fd0cbccb4ab35add74a243a546e5b7776a1201a166ba9e20001f9bf51789f530021f6903d8b1fdb49e34a69987081be3d0d47c57f251db3f81 SHA512 df6a20cdb6634bded9ff057623280d36989df3337bbde00b175fe8d75f095d2e3c02740c5e13994a188d7916fa5227b92f835368aad4a1e9dab6ff7c913d0ac9
-EBUILD countrycodes-1.0.5-r2.ebuild 740 BLAKE2B 83c64a8aa6ef050c3b806995cbf97186278ce7b443590a2adcd6400a2f259b58ecdcb8d5ff4896036b79d77ba1ab8b080e24d0586bb2805add75c787104799eb SHA512 d086a6445262ac67c4785d42f05d9067adeda4f7b8a1457f487393ca8bcd7db5556d7df20ddaf4a2fe7e2ec3d5abbc62ec4b1680138fad05d7bfce83b7d19e12
-EBUILD countrycodes-1.0.5-r3.ebuild 721 BLAKE2B 638dc959e7dfaa2e665990565aa1e2cc7b0bf99dd8a6fc95d57673bb91da3c5234fe2ed5384b00e21414c0b929463c708bab9dbe725a8a0d4fd8d518beecef22 SHA512 81400eb29501282a901623d145eb97dc6d89fb0580e8fe3c695e5adf54514ed15106d35158a1a521572f4807d284af7819c8202ee862a7f8f104546cf4108d55
+EBUILD countrycodes-1.0.5-r3.ebuild 718 BLAKE2B a898ca882636d63bd98cfb6df0ff7724efbb94d8c05664236d459b3b81750cba6d47ed06b5f6aea3252eb907e0f8b283de033f4ee52b5ebf8b12677bbe22e99c SHA512 4b34f1b15dd64e2fd328d6107117a4008f778ced83978c9262380a63a538cf7b3b1ad5656eb32ab74065fb0b80f6b606df06c34285b839c523ef903d36895a9a
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r1.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r1.ebuild
deleted file mode 100644
index 211e7bbf46fe..000000000000
--- a/app-misc/countrycodes/countrycodes-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An ISO 3166 country code finder"
-HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/"
-SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}"/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-Makefile.patch
-	tc-export CC
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		mandir="${D}/usr/share/man/man1" install || die "make install failed"
-	dosym iso3166 /usr/bin/countrycodes || die
-	dosym iso3166.1 /usr/share/man/man1/countrycodes || die
-	dodoc ../doc/{Changelog,README} || die
-	prepman
-}
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r2.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r2.ebuild
deleted file mode 100644
index b9140b6b2c8f..000000000000
--- a/app-misc/countrycodes/countrycodes-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="An ISO 3166 country code finder"
-HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/"
-SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${P}/src
-
-PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		mandir="${D}/usr/share/man/man1" install
-	dosym iso3166 /usr/bin/countrycodes
-	dosym iso3166.1 /usr/share/man/man1/countrycodes
-	dodoc ../doc/{Changelog,README}
-	prepman
-}
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
index d8c9b7ad8834..1860a7e686ea 100644
--- a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}"/${P}/src
 
diff --git a/app-misc/ondir/Manifest b/app-misc/ondir/Manifest
index b177bf4f620f..3eeb44f9ae7d 100644
--- a/app-misc/ondir/Manifest
+++ b/app-misc/ondir/Manifest
@@ -1,3 +1,4 @@
 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
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/ondir/ondir-0.2.2-r2.ebuild b/app-misc/ondir/ondir-0.2.2-r2.ebuild
new file mode 100644
index 000000000000..d483901c75fa
--- /dev/null
+++ b/app-misc/ondir/ondir-0.2.2-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+DEPEND="sys-apps/sed"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README INSTALL scripts.tcsh scripts.sh )
+HTML_DOCS=(  changelog.html ondir.1.html )
+
+src_prepare() {
+	default
+	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}"
+}
+
+src_install() {
+	default
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		CONF="${EPREFIX}/etc/ondirrc" \
+		install
+	newdoc ondirrc.eg ondirrc.example
+}