gentoo resync : 11.10.2017

5 files changed, 93 insertions, 5 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
+}
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 47c07c999f13..1d6f825b864e 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -23,7 +23,7 @@ EBUILD jabref-bin-3.7.ebuild 864 SHA256 0c8bb85eb692aab866229f838ba3d79a6f77b85a
 EBUILD jabref-bin-3.8.1.ebuild 951 SHA256 ef3e46804615b165fbc911ec3ca1cdd88adb97787f033e4ca246e55f038dff48 SHA512 6694b2a83bcb8830c754b5fe79284dd4936070b2ce0ae65426482fe869390d8534212b6824c39a3be1bc5755d7bc458959185e9ca483f7d2444ec0bd30b8dcdf WHIRLPOOL 439fce1e6bdc24602642679ad92b38bcc136144e1da9a34061c5d5fcaa923daf4c74eca58da1386c32e079625fcfad8e7e9777762acfa98865701bf76a5ca3dc
 EBUILD jabref-bin-3.8.2.ebuild 949 SHA256 7a6ab8c10f1cd6d06cb9f1a053d8b6abe69bae328641a53279c19da16bec4bc5 SHA512 a45a9fd77aaf59d172f2e12d49f720af8f5d6de9f53756941612d614ab1391767a79731a5fb0321d724330c483280df9883b76c64ca21635909434ca11e57ff7 WHIRLPOOL f91affa8bbf306f734b99a12abb136ef9663f68b37d1f3f29ee395b1f4bfb7dd2bf7215c006a388acbcaafa3b459b4aea719fd202cdd27064f4b759ff0cdec02
 EBUILD jabref-bin-3.8.ebuild 956 SHA256 430e2a4bc90f99001d78dd7eb21128455cac12ef5b71c688648016b1ce5ba272 SHA512 fc4c01169ba38ac8beaece6f2240791eec8c361b0a72bdca2fa26262115ef8d7e5c64b69d8398c21c7ee6d41597c837da6fb1aa3aedeff18f216228bab96de1e WHIRLPOOL 8e2aec29ea93e8385ba19f04742a2cab9017091207a1e10348c8128b3d8e619ea463119417759aa056771e6ca406dbe5237777e358afc0b8c8ffd78ed6731ef5
-EBUILD jabref-bin-4.0.ebuild 956 SHA256 c139358f7724efeab9bd90f6a79c796a142146fd9a7a379ed19973a086d588f0 SHA512 d80f47fabe97fcd54dab91e84d788549c7c40d1fbc3c410f886e719539e6ebbd997b47a96c1ca89f770844c147639a026d8f8b191ca65886facca8d08f221d76 WHIRLPOOL da96d23405a2958e295106b84f2e5a26cfdd06a0d90305f304b68e41182213303f6704f6efb28e06d927557a2eff8e604696586162b88f562db25ea8d19b92e6
+EBUILD jabref-bin-4.0.ebuild 965 SHA256 ab12b862e6f451ba4ca904591e72265652ff0d2b7c39d57e44373dde899de92b SHA512 d34674ce400cdd2b80291ffb60cf2409bba817d0a8e2e862ee1e1b405c2584841a09bc9b22581d3ded90a4298d8c37384bcbca326739163f9056739bc0ca1add WHIRLPOOL 0b29a5a926c54c98fff9309f128adeb8bb0b1ceba8eb334dd32af3d2e525eefecb6bd3784d9e9c5641dfb9638ead621ddbfffa9b7e41dae3ee1af2e46cfdad72
 MISC ChangeLog 6179 SHA256 2ded29d71e74422e71644639b0552a2ad2b16e5f865b917bfbcb3e39f6e4b56a SHA512 0e72d7494e5cc56699ec4dc63b3ee40c4c2aa4fd0351828b99fe1b3003e0e8326c92313154863918c38f48b02b9abfab12cb659cadacdb0bd86b380501ede9f5 WHIRLPOOL 2ab3b0307abc8e378644dfedf72c5314b9a46ef05b30460459acff798c50903dc402ae62f1307298ded3fc2d54d858014a36183cb4af5466b6a241312af000b4
 MISC ChangeLog-2015 1106 SHA256 ee587b34ef9ffa585089c57bbd8dfb4c51b50dffb590d4982a1a126ec04cfb5d SHA512 2855bd32273bdc948e20052168b52da82376a47c077a49fd6f7733e747660f690019b6b74a191c4eb5f7d77997ef66a38f8b38ee2095024c23cb5498f4c2b412 WHIRLPOOL f16c439fce25a059db2d30f4e88b70b224b5cb0faef0b35b161a54dd07dd4ce95e3b0576c54cf0258e7af85e24da791b553d8243c9bbc6924679a8e003ee7d78
 MISC metadata.xml 911 SHA256 3e1c02120f04c3bb62cf5d1f6e668ffe60db3317f683b8df3e03dd78b798985d SHA512 7a3e7ab167709c28857aed83ffd4e3ec5b202b9d444b4fc7a07c33d2415316e4aa8f22b80cc2bd281a1625e02503bbb5b517c01efe6a70558b2b9815b3b7f2b3 WHIRLPOOL fdd0992350101881fb1a82cf50d2e5ef616eb0c4f9ceeeaf623e55d66b97d5ad4499650dda10b4337e9bc8f705d730b5a2ae9e921f43820453f4dddaa56b9d8a
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild
index 5f6f30990ea9..8327029bd246 100644
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.0.ebuild
@@ -12,7 +12,6 @@ MY_URI_PV="${MY_URI_PV_1//_/%20}"
 
 DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
 HOMEPAGE="http://www.jabref.org/"
-# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
 SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
 
 LICENSE="MIT"
@@ -21,7 +20,12 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/unzip"
 
-RDEPEND=">=virtual/jre-1.8"
+RDEPEND="
+	|| (
+		dev-java/oracle-jre-bin:1.8[javafx]
+		dev-java/oracle-jdk-bin:1.8[javafx]
+	)
+"
 
 S="${WORKDIR}"