gentoo resync : 11.10.2017

3 files changed, 86 insertions, 2 deletions

diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index a351156fffea..19555eb89c15 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,9 @@
 DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710 WHIRLPOOL 46c771c63572d0d0301db5bde4734297df037654cbc71e5a8f93003fbf503399ec5026bc53fea3b3b10e346e2b59d24bdcd6d9139342354cdb1b8a6e240deaeb
 DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
+DIST dos2unix-7.4.0.tar.gz 710339 SHA256 bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9 WHIRLPOOL 89f093ff96aadbe64f5fb448d2be337464a0059cee3009cd513dbd0315b486c012efe53273467774dc9f884dfe5b1a4ee65903b94c2c5dd8c062ed3e41eed94a
 EBUILD dos2unix-7.3.4.ebuild 2026 SHA256 2740f83a639d0e3de27e615e429dbbd9bc61a6ba67addcea2ff5514f9d288e71 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760 WHIRLPOOL 3a6302216ca7ffc009902dae8475991151f0dcb9f8a38b7b46deb2a05b54eb6fc0388021130f911a2af5c36006631bbbfa4ace248a5614319da0cf2b3c77c923
-EBUILD dos2unix-7.3.5.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
+EBUILD dos2unix-7.3.5.ebuild 2044 SHA256 2144a701845e01d69b6fbb7c91161b2647297a1e6fe6468c1cb5712f6e15049e SHA512 023e040e54131654d87cd1c991576b243920e31524ad02bdd1c9cce9cb25dae8536fe6ab989ddd734f53dbc8b4ec785ad8cb778cb6cf4bb125e915046efdbc6e WHIRLPOOL c1b5d999e690af188f3236ef14e002ac50a7a275ebae335166bbd7d02479638382f272ef333e6e2aee914593e7c7ef56160c8d7a97b896b02dd40b0fa559c6da
+EBUILD dos2unix-7.4.0.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
 MISC ChangeLog 7196 SHA256 4a2c232190d6729640540918b5be7b533c2edaaa445f850cc6a47b9c3a59f04a SHA512 66da70a04731f3bd299bc577885b31e3c278016b38b1f5228394a384f960c49a0c3e97154ec82ef1489c9a9fce195077254240e458f649037e6859b0c060fe50 WHIRLPOOL 48484b065ae3a96f6c15a454e701ce60cac060d2a1e1466afc29d18544ca2f9d2d5cddb60820b6d8f400c568d1a2386febc868662587b5ddf6c9996ec7adf5d3
 MISC ChangeLog-2015 19680 SHA256 99b0f5f0d9a2a0ae8117f683cd295d8a8c5b0cfc2208325fc96cdb7c6ad416db SHA512 6921c2763ca5d07eba46899fc0ba3869042972fc9d60e85c835eb50d08b56ebc6a176a64d1e808802b1afe5ea7b6c2ad74f773fc50e55fbd83ee224c317a003e WHIRLPOOL f9e49b2959b16982e507cd9b67e24d9d5fd535d1b61676f1621a012ec2c15541a5382ab54aedd635669c13be995ce008d77dc52e0110c168da42a6d407465cf5
 MISC metadata.xml 343 SHA256 accb2d04b009f465af9d869da452b1c3d87b42cf599aeb5dad3a9fee04d3d225 SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3 WHIRLPOOL da97fdf7c8ac3e5877f177dfc34336c261e7317551ded69c7e4cdc92569091ff2d6b6f491995c3cb57db3483a5136ac0a9bba8c2471025b31bb290e94062f1f1
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index 7e09f7d15bea..3ed4ddaa73ab 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.0.ebuild b/app-text/dos2unix/dos2unix-7.4.0.ebuild
new file mode 100644
index 000000000000..7e09f7d15bea
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.4.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}