# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1452066004 -3600
# Node ID d54d47bdd912cbb32e01f761a982dc0fdd36be56
# Parent  4fa9585d608a0bb4efd88f419ba1e0bfd2aa3eda# Parent  88a4dd9f74a7ed0717c10ddfd1042995778cfa31
Automated merge with https://localhost/hg/portage

diff -r 88a4dd9f74a7 -r d54d47bdd912 app-emulation/docker-compose-bin/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-emulation/docker-compose-bin/Manifest	Wed Jan 06 08:40:04 2016 +0100
@@ -0,0 +1,2 @@
+DIST docker-compose-bin-1.5.0-Linux-x86_64 7922818 SHA256 f920ae9e3907b5007d3d833f1d369f908eeeabf31f292130636102b0c9b6ddf1 SHA512 ddad11180d956cad902440ce48062dfe41eb6f076707a603891de45e3315c5ff6bc17001e04aea9ff422935347b9ba80afda7c139e96fe61c9ff6ff3150b3385 WHIRLPOOL 6be6daf14ce17e2014c15b4cfaef13947eb1120184e10845f71cf984bf70662fca6de637f31304c5d2056f7a985adb28847442ffd060294c6ce386b3cd939618
+EBUILD docker-compose-bin-1.5.0.ebuild 618 SHA256 1ad670d6a20473b58a0bdcd2db7c1508a68e7b709ad313d14705a2840ea1e2d6 SHA512 fdc0cf63f58e7b68dcc0d1ec9b4e3eae09a60cb79786d7f512ed2d546fafda580f5d2f5a9efb1de32c8b80c29abcfff4148c4ec296a0bc544c19a38397da2b37 WHIRLPOOL d40168dfa361ec3b101d7980b40096ad8da0801effb716ed36f8977ce70e29f723addc4d1529d7fa60d57d5eed7cc6195bd723692fdfa0952e279273eb75cec4
diff -r 88a4dd9f74a7 -r d54d47bdd912 app-emulation/docker-compose-bin/docker-compose-bin-1.5.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-emulation/docker-compose-bin/docker-compose-bin-1.5.0.ebuild	Wed Jan 06 08:40:04 2016 +0100
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Compose is a tool for defining and running complex applications with Docker"
+HOMEPAGE="https://docs.docker.com/compose/"
+MY_PN="${PN%-bin}"
+MY_PV="${PV/_/}"
+SRC_URI="
+	amd64? ( https://github.com/docker/compose/releases/download/${MY_PV}/${MY_PN}-Linux-x86_64 -> ${P}-Linux-x86_64 )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+RESTRICT="installsources strip"
+
+S="${DISTDIR}"
+
+src_install() {
+	newbin ${P}-Linux-x86_64 ${MY_PN}
+}
diff -r 88a4dd9f74a7 -r d54d47bdd912 dev-java/maven/Manifest
--- a/dev-java/maven/Manifest	Wed Jan 06 08:39:47 2016 +0100
+++ b/dev-java/maven/Manifest	Wed Jan 06 08:40:04 2016 +0100
@@ -1,7 +1,5 @@
 AUX maven 5108 SHA256 ddce53375271fd6e9515350083fd4c97ae86213e5bdb9984faf770ccdac1ff10 SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b WHIRLPOOL 6f281693bcf3201e9aa245494dd4dec6b623adf19bf89a44461eadb27e6747c590cebe7c73b5f16b77f5eaa04991236ce6820cd0e5980d7e109f110338c6045c
-DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
-DIST apache-maven-3.3.1-bin.tar.gz 8059952 SHA256 153564900617218a126f78d2603d060d0a15f19f3ec1689fc2b7692a3c15b9aa SHA512 b5f601c6a321d2aecebd3582a40ab46943d07b4a690bbe9cbc084369fa1728556fb9758fa885665863f6ab9dd296c8efa4a50902684a9dd8b66ab1e79ea3d8ac WHIRLPOOL bea3d1c3bdb997aa702b47da1797070ad79ed3e76cbbd530a75e67f0262d20579b98c1d72a2554a02e268ecb9eedce18daa2bfbb0ef231540075348e58a8da97
 DIST apache-maven-3.3.3-bin.tar.gz 8042383 SHA256 3a8dc4a12ab9f3607a1a2097bbab0150c947ad6719d8f1bb6d5b47d0fb0c4779 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 WHIRLPOOL a3bbce5c92878dbf58f9e63a18cefbb8de90fa4d91ec6ac60cee01b684891a9f757ece5f62659b7838ea347e0d27b8801c10b0e4bf1384446607b60d46a1bf9e
-EBUILD maven-3.2.5.ebuild 1198 SHA256 56ea6f674eda20ec75de1d50258353091edeff10addde343305ee8fabdd5f816 SHA512 027c5a7e10da7d39d308afa1f65fb55aff03fd2a4a24f4cff951f7c568c641edbbb45af56d9088ed01e1f74c5f2f4357801a7235543554818facad52dd30102e WHIRLPOOL f01297d6df6e2d566ebf90f28fd93d9a016e9f29ea94019601e581d6979a7a700e5e499e7274dc6bedb0db829c1814259d89183cc2b7ff47aadb4a4d4e83a6d2
-EBUILD maven-3.3.1.ebuild 1220 SHA256 58f3f6637a427d35ae09541d4ce6e899be102132682b80ebe84246c8391007c4 SHA512 086c7f0f6170a33c8655265106f36ed844059c33f77becba65db3428f4f2a335eb1b6cdcc460a5ec83594890c79516392a54c1464602df4f12e48fc51659a034 WHIRLPOOL 0262778af51326666228410356f4185354b683260baa34fbec1d691ebf1af55abc5ac90efc7f2bd851ca88860da61df0c2a44465274ed72de02520be720c4ed5
+DIST apache-maven-3.3.9-bin.tar.gz 8491533 SHA256 6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0 WHIRLPOOL a17d87711a925d502bb05d09166708b50304942aace82a6ed69dd9f73938590f1cf488eb4b9fb10f94250d804e6342d264f6a9407218fe9b38c242c06375b28b
 EBUILD maven-3.3.3.ebuild 1220 SHA256 58f3f6637a427d35ae09541d4ce6e899be102132682b80ebe84246c8391007c4 SHA512 086c7f0f6170a33c8655265106f36ed844059c33f77becba65db3428f4f2a335eb1b6cdcc460a5ec83594890c79516392a54c1464602df4f12e48fc51659a034 WHIRLPOOL 0262778af51326666228410356f4185354b683260baa34fbec1d691ebf1af55abc5ac90efc7f2bd851ca88860da61df0c2a44465274ed72de02520be720c4ed5
+EBUILD maven-3.3.9.ebuild 1220 SHA256 58f3f6637a427d35ae09541d4ce6e899be102132682b80ebe84246c8391007c4 SHA512 086c7f0f6170a33c8655265106f36ed844059c33f77becba65db3428f4f2a335eb1b6cdcc460a5ec83594890c79516392a54c1464602df4f12e48fc51659a034 WHIRLPOOL 0262778af51326666228410356f4185354b683260baa34fbec1d691ebf1af55abc5ac90efc7f2bd851ca88860da61df0c2a44465274ed72de02520be720c4ed5
diff -r 88a4dd9f74a7 -r d54d47bdd912 dev-java/maven/maven-3.2.5.ebuild
--- a/dev-java/maven/maven-3.2.5.ebuild	Wed Jan 06 08:39:47 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-
-DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
-
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff -r 88a4dd9f74a7 -r d54d47bdd912 dev-java/maven/maven-3.3.1.ebuild
--- a/dev-java/maven/maven-3.3.1.ebuild	Wed Jan 06 08:39:47 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="amd64 x86"
-
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
-
-RDEPEND=">=virtual/jdk-1.7
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -fv "${S}"/bin/*.bat "${S}"/bin/*.cmd || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff -r 88a4dd9f74a7 -r d54d47bdd912 dev-java/maven/maven-3.3.9.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/maven/maven-3.3.9.ebuild	Wed Jan 06 08:40:04 2016 +0100
@@ -0,0 +1,58 @@
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="amd64 x86"
+
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+
+RDEPEND=">=virtual/jdk-1.7
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -fv "${S}"/bin/*.bat "${S}"/bin/*.cmd || die
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+}
+
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff -r 88a4dd9f74a7 -r d54d47bdd912 dev-util/bouml/Manifest
--- a/dev-util/bouml/Manifest	Wed Jan 06 08:39:47 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-DIST bouml_4.4.1.tar.gz 4621079 RMD160 6e532366a3efa399944675c88d63549c695ea0ef SHA1 edef76f9de7e6d74d67778d3c135323b1ac4ab1c SHA256 d73117423d5b79549e5520e8d816c88eecb4400533fd8bffa7584003739fb3d6
-EBUILD bouml-4.4.1.ebuild 863 RMD160 47066bd3274de00e80f41fbe4238b37e65029d8e SHA1 1e8919260fa88786101ace8225f4e68a3b628022 SHA256 84b59c27cd15b4ed4a1b15a712492c547606df27a31990929c3d9a7a76c1fbb5
diff -r 88a4dd9f74a7 -r d54d47bdd912 dev-util/bouml/bouml-4.4.1.ebuild
--- a/dev-util/bouml/bouml-4.4.1.ebuild	Wed Jan 06 08:39:47 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bouml/bouml-3.4.ebuild,v 1.1 2007/12/23 21:27:06 ferdy Exp $
-
-inherit multilib qt3
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Free UML 2 tool with code generation"
-HOMEPAGE="http://bouml.free.fr/"
-SRC_URI="http://bouml.free.fr/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="x11-libs/qt:3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	find src/ genplugouts/ -type f -name "*.pro" | while read file; do
-		local subdir="${file%/*}"
-		eqmake3 "${file}" -o "${subdir}"/Makefile
-		emake -C "${subdir}" || die "emake failed in ${subdir}"
-	done
-}
-
-src_install() {
-	emake BOUML_LIB="/usr/$(get_libdir)/bouml" DESTDIR="${D}" install \
-		|| die "emake install failed"
-}