Merge remote-tracking branch 'github/master'

* github/master:
  sci-libs/asl: add live ebuild, unify life and release ebuilds.
  sci-libs/asl: remove old version
  sci-libs/asl: version bump
  sci-astronomy/casapy-bin: version bump casapy-bin to 4.4.0
  dev-java/jeuclid-core: Fix src_prepare(); Fixes bug #554558
  Ignore generated manpages
  Import from tree

11 files changed, 132 insertions, 50 deletions

diff --git a/.gitignore b/.gitignore
index 14f4f8cd6..af5f05fce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 app-misc/dummy
+eclass/*.5
diff --git a/dev-java/jeuclid-core/ChangeLog b/dev-java/jeuclid-core/ChangeLog
index c3a5f1ec7..c2bbb1883 100644
--- a/dev-java/jeuclid-core/ChangeLog
+++ b/dev-java/jeuclid-core/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2015; Marius Brehler <marbre@linux.sungazer.de>
+  jeuclid-core-3.1.9-r1.ebuild:
+  dev-java/jeuclid-core: Fix src_prepare(); Fixes bug #554558
+
   08 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>
   jeuclid-core-3.1.9-r1.ebuild:
   dev-java/jeuclid-core: Fix dependencies
diff --git a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild
index bd748392b..e5bb1dbb2 100644
--- a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild
+++ b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild
@@ -40,9 +40,9 @@ src_prepare() {
 
 	# add dependencies into the lib dir
 	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from batik-1.7 batik-all.jar
+	java-pkg_jar-from batik-1.8 batik-all.jar
 	java-pkg_jar-from commons-logging,jcip-annotations,xml-commons-external-1.3
-	java-pkg_jar-from xml-commons-external-1.3,xmlgraphics-commons-1.5
+	java-pkg_jar-from xml-commons-external-1.3,xmlgraphics-commons-2
 }
 
 src_install() {
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 2c60215da..05e002d86 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,29 +1,34 @@
 repo-name = science
 
-masters = gentoo
-
-# Use new hashes
+# This went live Wednesday, July 4, 2012 at 10:00 UTC
+# For more details, please see: http://archives.gentoo.org/gentoo-dev-announce/msg_00000.xml
+# and/or GLEP 59.
 manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
-# Let repoman update changelogs
-update-changelog = true
-
-# Use thin manifests
-thin-manifests = true
-
-# Dont sign thin manifests (because it re-introduces the 
-# just avoided merge conflicts)
-sign-manifests = false
+# 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670).
+# 2014-02-25 council meeting deprecated EAPIs 0 and 3.
+eapis-banned = 0 1
+eapis-deprecated = 0 1 2 3
 
-# sign commits using git mechanisms
-sign-commits = true
+# Bug #337853 - gentoo's council says to enable
+# --echangelog by default for the "gentoo" repo
+update-changelog = true
 
 # Make egencache generate newer (more reliable)
 # md5-dict cache format (see bug #409445).
+# NOTE: list md5-dict first so clients prefer it
+# INFRA NOTE: Format 'pms' was removed on Aug 6 2012. (Announced prior as Aug 1
+# 2012 was the removal date)
 cache-formats = md5-dict
 
-# indicate that ebuilds with the specified EAPIs are banned
-eapis-banned = 0 1
+# Support for implicit masters is deprecated, so we need to explicitly
+# specify that this repo does not dependent on any masters, in order
+# to distinguish it from repos that rely on the deprecated behavior.
+masters = gentoo
 
-# indicate that ebuilds with the specified EAPIs are deprecated
-eapis-deprecated = 1 2 3 4
+# Use thin Manifests for Git
+thin-manifests = true
+
+# Sign Git commits, and NOT Manifests
+sign-commits = true
+sign-manifests = false
diff --git a/sci-astronomy/casapy-bin/ChangeLog b/sci-astronomy/casapy-bin/ChangeLog
index 8a563a78d..4ddfbd3e1 100644
--- a/sci-astronomy/casapy-bin/ChangeLog
+++ b/sci-astronomy/casapy-bin/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-astronomy/casapy-bin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*casapy-bin-4.4.0 (10 Aug 2015)
+
+  10 Aug 2015; Joseph Jon Booker <joe@neoturbine.net> +casapy-bin-4.4.0.ebuild:
+  sci-astronomy/casapy-bin: version bump casapy-bin to 4.4.0
+
 *casapy-bin-4.2.2.30986_p1 (09 Sep 2014)
 
   09 Sep 2014; Joseph Jon Booker <joe@neoturbine.net>
diff --git a/sci-astronomy/casapy-bin/Manifest b/sci-astronomy/casapy-bin/Manifest
index c70a0dda5..eeee7bb9b 100644
--- a/sci-astronomy/casapy-bin/Manifest
+++ b/sci-astronomy/casapy-bin/Manifest
@@ -1,2 +1,3 @@
+DIST casa-release-4.4.0-el6.tar.gz 1028567130 SHA256 5c67dd31618b7125a57b4af828c717f5b3c8468d13b34d6fedccf8c5597bfa66 SHA512 ee71bd6d80c18db570f42e54d8d0d2d8cc512497ee885e316a81cc1f71480abb21681a8ef39991fe3673a70d036e1418a7f7d77909b3bc7ff2b32c8be004409f WHIRLPOOL 9087abb839f6d21b15ee363fcbf1e0794265881bf2948a498ce08210eebbb9ce0e976ee14f77fe591b85513a1d15d92fdf8b61ce438f26342418edcdfb16a772
 DIST casapy-42.1.29047-001-1-64b.tar.gz 985311640 SHA256 966b86af4a09fc962b5eebd6b8679d686b5e811c17364e1350ea6c332f525ff0 SHA512 506a7d173a4196106d437ba234a48b186d036b82d524d89fbe476045de979992c438db12bcaa4eb42b551f1f9c65fd83fce3c7469a8c8ef60a4692d71bab40dc WHIRLPOOL 2e8b62f036fd4b822966954187f15ff5d247ac90a5e550bc94fb4102aade623526d14fc2edc843ca4a821bc26d5adfc89054f9190351e17d2ef10ba69b00454c
 DIST casapy-42.2.30986-1-64b.tar.gz 1000907646 SHA256 e178b8005efeb9eee60f809f1eef6d55a5cd29b9b62b1a5a3103277635188f0c SHA512 2410b0e802752a1992a0add4cd23bd0f0dc9a0ca21895f1cd88ffb81ab5566b8bd1ff2c6c64759760105e65d0f844efa453b6ab52b2f86bc4017f5337fa66f5e WHIRLPOOL 340e99f95892a49b40ca1fb3da11110a99fda36f882b01de2cb9fee4c4f0b8609c07c46271d299146bbaeb1661aad18e409f2143f21be90f605e9e7a82e3d2cb
diff --git a/sci-astronomy/casapy-bin/casapy-bin-4.4.0.ebuild b/sci-astronomy/casapy-bin/casapy-bin-4.4.0.ebuild
new file mode 100644
index 000000000..f545ae23b
--- /dev/null
+++ b/sci-astronomy/casapy-bin/casapy-bin-4.4.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit versionator
+
+DESCRIPTION="Software package to calibrate, image, and analyze radioastronomical data"
+HOMEPAGE="http://casa.nrao.edu/"
+
+MY_P=${P/py-bin/-release}-el6
+SRC_URI="https://svn.cv.nrao.edu/casa/linux_distro/release/el6/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/mit-krb5
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/icu
+	dev-libs/libxslt
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base
+	media-libs/libjpeg-turbo
+	media-libs/mesa
+	media-libs/tiff
+	sci-libs/gsl
+	sci-libs/pgplot
+	sys-apps/keyutils
+	sys-apps/util-linux
+	sys-devel/gcc[fortran]
+	virtual/libffi
+	x11-libs/libdrm
+	x11-libs/libSM
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+
+S="${WORKDIR}/${MY_P}"
+QA_PREBUILT="/opt/casapy/* /opt/casapy/sbin/* /opt/casapy/lib64/*"
+
+src_compile() { :; }
+
+src_install() {
+	dodir /opt/
+	cp -R "${S}" "${D}/opt/casapy" || die "Could not copy casapy into ${D}/opt"
+
+	dodir /opt/bin
+	cd "${D}/opt/casapy/bin"
+	for binary in `ls`
+	do
+		dosym ../casapy/$binary /opt/bin/$binary
+	done
+}
+
+pkg_postinst() {
+	einfo "CASA will use media-gfx/graphviz if this package is installed."
+	ewarn "Upstream warns that SElinux must be disabled, set to permissive, or configured to allow execheap."
+}
diff --git a/sci-libs/asl/ChangeLog b/sci-libs/asl/ChangeLog
index 84477a053..44700631d 100644
--- a/sci-libs/asl/ChangeLog
+++ b/sci-libs/asl/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*asl-9999 (11 Aug 2015)
+
+  11 Aug 2015; Andrew Savchenko <bircoph@gentoo.org> +asl-9999.ebuild:
+  Add live ebuild. Unify life and release ebuilds.
+
+  11 Aug 2015; Andrew Savchenko <bircoph@gentoo.org> -asl-0.1.4.ebuild:
+  Remove old.
+
+*asl-0.1.5 (10 Aug 2015)
+
+  10 Aug 2015; Andrew Savchenko <bircoph@gentoo.org> +asl-0.1.5.ebuild:
+  Version bump, examples are now installed natively.
+
 *asl-0.1.4 (25 Jul 2015)
 
   25 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> +asl-0.1.4.ebuild,
diff --git a/sci-libs/asl/Manifest b/sci-libs/asl/Manifest
index 721bffbfb..2947391fd 100644
--- a/sci-libs/asl/Manifest
+++ b/sci-libs/asl/Manifest
@@ -1 +1 @@
-DIST asl-0.1.4.tar.gz 11068628 SHA256 a8ec82e7ecc05911156ce08dd3f4c571c7dbc4d0dc30950cd8130a197d66da4f SHA512 8a4705abf37f82bb1e3ffd0ce0897e7077288436251dc3dbf9f5dbd5b606845e272ac7feb7091597982a636f8f3554e0161a664c8ea23cf4ee1ac6105b896039 WHIRLPOOL c1913cd16fe77dd6a204cc8dce481ad4dbccafca57d2f002dcadc8f198cdef44ca5dd220a88c3d1b1e3a5d83d3aa51c03ace74b59a6b7c0339908bead6605535
+DIST asl-0.1.5.tar.gz 11109430 SHA256 c90be05a6f0b5c7bf12a9630355838e86edf8e2199a238b44b042147d85dfb18 SHA512 97b1a24e200bac1949999a6d3fcf7e9b391b9326abb34ab88acd9ed167e40e613ffabda971db70bfc208e19987c194ddbcc6ecdb4090c02b40c44e3cf1ccd8f6 WHIRLPOOL 2f7a02a53a5c8bb80b49cba8c446bad5492fc167bbc05385db13e52388ddc5694ad8a8699398b2156f5b5dd974bafa41feb595ae33163d77db3b59c0d40c66aa
diff --git a/sci-libs/asl/asl-0.1.5.ebuild b/sci-libs/asl/asl-0.1.5.ebuild
new file mode 120000
index 000000000..2176c62f8
--- /dev/null
+++ b/sci-libs/asl/asl-0.1.5.ebuild
@@ -0,0 +1 @@
+asl-9999.ebuild
\ No newline at end of file
diff --git a/sci-libs/asl/asl-0.1.4.ebuild b/sci-libs/asl/asl-9999.ebuild
index 15be510f1..0b7f2fd72 100644
--- a/sci-libs/asl/asl-0.1.4.ebuild
+++ b/sci-libs/asl/asl-9999.ebuild
@@ -4,19 +4,26 @@
 
 EAPI=5
 
+MY_PN=ASL
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/AvtechScientific/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/AvtechScientific/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
 CMAKE_MIN_VERSION=3.0.2
 CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-ninja}"
 
 inherit cmake-utils
 
-MY_PN=ASL
-
 DESCRIPTION="Advanced Simulation Library - multiphysics simulation software package"
 HOMEPAGE="http://asl.org.il/"
-SRC_URI="https://github.com/AvtechScientific/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="doc examples matio"
 
 RDEPEND="
@@ -29,8 +36,6 @@ DEPEND="${RDEPEND}
 	matio? ( >=sci-libs/matio-1.5.2 )
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
@@ -41,25 +46,3 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
-
-src_install() {
-	cmake-utils_src_install
-
-	# examples are not installed by cmake :/
-	if use examples; then
-		local f
-		cd "${CMAKE_USE_DIR}/examples" || die
-		for f in $(find -O3 -type f -name "*.cc" -printf "%P\n" || die); do
-			cp "${f}" "${BUILD_DIR}/examples/${f%%.cc}" || die
-		done
-		cp -a input_data "${BUILD_DIR}/examples" || die
-
-		cd "${BUILD_DIR}/examples" || die
-		chmod a-x input_data/multicomponent_flow.pvsm || die
-		find -O3 -type f -name cmake_install.cmake -delete || die
-		find -O3 -type d -name CMakeFiles -exec rm -rf '{}' \+ || die
-
-		mkdir -p "${ED}/usr/share/${PN}/examples" || die
-		cp -a . "${ED}/usr/share/${PN}/examples" || die
-	fi
-}