Sync with portage [Thu May 26 12:13:24 MSK 2016].

8 years ago · a883775302
parent ae28fe1fa8
commit a883775302
1143 changed files with 4721 additions and 7472 deletions
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,3 +1,4 @@
 DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
 DIST ansible-1.9.6.tar.gz 941457 SHA256 50773781b1e76f2885bbeb2351a97cf1c6a29239d3e073da939a104e7e81ee5d SHA512 97ea17f032bf253c53d5e1f79071603f0b3b7caffe4e267534cf181ab88b7186d953c41203c762e0650ab70302bde7e84bb5ee8bcd03153a3e4a76e41d1a3bec WHIRLPOOL b26390090aeabd2a6e8e27916a7cc0e89e0041715bd036118f034292da52df55107d27c577fe38e838b3455d3167cf3e876533fa47fe184d02ebfaa98cf46f5e
 DIST ansible-2.0.2.0.tar.gz 1516681 SHA256 373a2e50319d90da50948e3faf1c033464b7302200e0199da8981d24646d4387 SHA512 0f78f15fcfcfe0e0fe60b1ee5f60b101d93f1fa81de942955a036763da4d492f86f2854cc8561e36427c23beb9b70bc577f5d0f42d9a3c7c966bb0979dee8011 WHIRLPOOL a704fea45396ab635662d6df07888ea17321e9f42127957c658ed88f02968a96b6f7fa1f8efa9c266c13f40ff3ab8f00377ac631fcafe0c402a258d71953cf3a
+DIST ansible-2.1.0.0.tar.gz 1877209 SHA256 403443b55f6522cf86f9b41544a9b6b81f7d27f088446e85334d5d7a6317ccad SHA512 8601325098b70469cf908ce09c075334952774519a4331f109b6aa0568fc718bb347ea4d06389277e41ce54270b19dca01815f46071d8e638e0cd751957f20c7 WHIRLPOOL 03cb5713eecd8bb8c050366c0c23d040fb3a27fa5da91a3fa3ffc14871052e24e2f207eb6c6f35f4f8e4893dd566de5b9d33a72da321dc2833b86b20356de3fa
--- a/app-admin/ansible/ansible-2.1.0.0.ebuild
+++ b/app-admin/ansible/ansible-2.1.0.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+BLAKE2B_HASH="26/6e/3974858f047641de6ceffad0f51ab7cafa5f2c09d1474c6221ec96434f58"
+SRC_URI="https://pypi.python.org/packages/${BLAKE2B_HASH}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="keyczar test"
+
+RDEPEND="
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+}
--- a/app-admin/systemrescuecd-x86/metadata.xml
+++ b/app-admin/systemrescuecd-x86/metadata.xml
@ -5,6 +5,13 @@
    <email>mgorny@gentoo.org</email>
    <name>Michał Górny</name>
  </maintainer>
+  <use>
+    <flag name="isohybrid">
+      Pass downloaded images through isohybrid in order to make it
+      possible to copy them directly to USB media and boot (requires
+      <pkg>sys-boot/syslinux</pkg> at build time).
+    </flag>
+  </use>
  <upstream>
    <remote-id type="sourceforge">systemrescuecd</remote-id>
  </upstream>
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,9 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 LICENSE="GPL-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"

 S=${WORKDIR}

@ -20,6 +22,12 @@ RESTRICT="mirror"
 src_install() {
 	insinto "/usr/share/${PN%-*}"
 	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
 }

 pkg_postinst() {
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""

 RDEPEND=">=app-i18n/fcitx-4.2.7[qt4]
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild
@ -23,7 +23,7 @@ fi

 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="minimal"

 RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4]
--- a/app-misc/pax-utils/pax-utils-1.1.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.1.6.ebuild
@ -54,5 +54,5 @@ src_test() {
 }

 src_install() {
-	_emake DESTDIR="${ED}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
 }
--- a/app-portage/eix/eix-0.31.7-r1.ebuild
+++ b/app-portage/eix/eix-0.31.7-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools"

 BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
--- a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""

 DEPEND="dev-libs/xapian:0/1.2.22
--- a/app-text/xiphos/xiphos-4.0.4.ebuild
+++ b/app-text/xiphos/xiphos-4.0.4.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20150830"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.4
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	net-libs/biblesync
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog README RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
--- a/dev-haskell/http-conduit/Manifest
+++ b/dev-haskell/http-conduit/Manifest
@ -1,2 +1,3 @@
 DIST http-conduit-2.1.10.1.tar.gz 26897 SHA256 36ebae73f7bf984e1062aa6079b935069b49a5b3811ea935194c0cecb8de815f SHA512 be9334d477effb5e691a3fb8faac40abd09a855205cefe0018315fbdca7de0fca00396e7fa66ca64c87ec2ee8d04177a4a2598349cfc3948f21000c4d23a0c72 WHIRLPOOL cfffeda187926a48fdc6e2936025d33a6ff0f108945fdb39ed1ffc25a43b9b3feda8f77813ce9a0c558f143e18ef53c26e9daff77e03a7c38b0acac8823ba265
+DIST http-conduit-2.1.7.2.tar.gz 23333 SHA256 ccd5d034d9c1f185ccf600e7f6d6153df793218233683ba073bab62d5449dc46 SHA512 020eae7a5846a880270b24d85ea4e7c2742c0f701e9e895b4dcaa1856f794fd00e09951e171104a173679d062789e5214ee24e0d63984e7d94d2cb2e5e7fb0ce WHIRLPOOL 10833001140438370ef01d3207562851c38339993f5d16d8c21a3c3c2627d94fbb0d38bccf2004a059ca2702d5567ca259cd9989cd0bf6776cb97073acd23652
 DIST http-conduit-2.1.8.tar.gz 23331 SHA256 550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d SHA512 a5791e9cc9a5d8a077a54286e163cf16b388e1c1a71f31989e731ad724de887d96bd985805380b3ad7ed8d0570c8577c38bd1a36567ee38924487c7a200d304d WHIRLPOOL 4671a0557363c9170f28ab947e48a1a38d830c8b2d2843be15bea42db2cf192e20492ea9d22f39bca9826b01b8144a16d5914a84f0df5721a175c5768bab2d89
--- a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
+++ b/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
+HOMEPAGE="http://www.yesodweb.com/book/http-conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/http-client-0.4.3:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/blaze-builder
+		dev-haskell/case-insensitive
+		>=dev-haskell/conduit-1.1
+		dev-haskell/conduit-extra
+		>=dev-haskell/connection-0.2
+		dev-haskell/cookie
+		dev-haskell/data-default-class
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/network
+		dev-haskell/streaming-commons
+		dev-haskell/text
+		dev-haskell/utf8-string
+		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.1
+		dev-haskell/wai-conduit
+		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2
+		dev-haskell/warp-tls )
+"
--- a/dev-haskell/wx/Manifest
+++ b/dev-haskell/wx/Manifest
@ -1,3 +1 @@
-DIST wx-0.13.2.3.tar.gz 47946 SHA256 fb61abfd40eaa3d7f1284735219b8d9dd09791ff0494aa27ee8cd7480e2367a6 SHA512 814dc90c21457dee946d9641e3b7b568c1dbacde840d5082deeeb5099612854c7736dd58633f228e1e3b660f27adbef57a4be7ed8ad7270599165a3c0f1dd385 WHIRLPOOL b5aa39c101d94a01b7cc21a9e540362abe2eb397b871b6b34fa85117b81c6ad24e185cca8ab22960d95bfc983ad2c30aa65af689d1e6c0a637983a33715d8e35
-DIST wx-0.90.1.0.tar.gz 48667 SHA256 c94e6ac36aa019e091098d871d4c39eb3f6735f6ef03e6093b7bb0715aaec998 SHA512 864255c753d77228c0815b78c4b17eb0d0f647ce4943a3e08aa2b610a2956f560ea492e043a534ca8812f39999a0fcbe0f608d85cbb08484b2c47a5c6431c4d9 WHIRLPOOL c318a37ae30bff5287f74622311de27e79adfe6bec2bd1e5d40c68acfc56c8c41960e4d85582c699cfe2e53ebd1b51c2ba391ea4eff6362ec9cdf8ded87e8af8
 DIST wx-0.92.2.0.tar.gz 50938 SHA256 a1d02b17cd336f0c435381c9f2ce74aad2059c56a00c678954089b74065a97fb SHA512 f8bbb2598fc1555030ebe3084737d6f8c0691a3e2fddd9b979c4694442b458937a9bb6afe347b2a5661b7d70339194087ce083ad6efc01173bc0f62b72bf1134 WHIRLPOOL abf86d664afd3b8e109e0745d89d035cab0ca6e537305b38a97afe1c1cb84a61b87f527968d8b901b91d6d1165d7ee65d5e0b7001bf7b77a946016b49bb5c442
--- a/dev-haskell/wx/files/wx-0.13.2.3-ghc-7.10.patch
+++ b/dev-haskell/wx/files/wx-0.13.2.3-ghc-7.10.patch
@ -1,8 +0,0 @@
-diff --git a/src/Graphics/UI/WX/Window.hs b/src/Graphics/UI/WX/Window.hs
-index 0b04fa9..39c0505 100644
--- a/src/Graphics/UI/WX/Window.hs
-+++ b/src/Graphics/UI/WX/Window.hs
-@@ -1,2 +1,2 @@
-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
-+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, FlexibleContexts #-}
- --------------------------------------------------------------------------------
--- a/dev-haskell/wx/wx-0.13.2.3.ebuild
+++ b/dev-haskell/wx/wx-0.13.2.3.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN=wx
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="wxHaskell"
-HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stm:=[profile?]
-	>=dev-haskell/wxcore-0.13.2.3:${WX_GTK_VER}=[profile?] <dev-haskell/wxcore-0.90:${WX_GTK_VER}=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.13.2.3-ghc-7.10.patch
-}
-
-src_configure() {
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
-	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9303
-	[[ $(ghc-version) == 7.8.3 ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		--flag=newbase
-}
--- a/dev-haskell/wx/wx-0.90.1.0.ebuild
+++ b/dev-haskell/wx/wx-0.90.1.0.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.9"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN=wx
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="wxHaskell"
-HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stm:=[profile?]
-	>=dev-haskell/wxcore-0.90.1.0:${WX_GTK_VER}=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.13.2.3-ghc-7.10.patch
-}
-
-src_configure() {
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
-	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9303
-	[[ $(ghc-version) == 7.8.3 ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		--flag=newbase
-}
--- a/dev-java/charva/Manifest
+++ b/dev-java/charva/Manifest
@ -1 +0,0 @@
-DIST charva-1.1.4.zip 2100886 SHA256 cc62e83e80efb7ddfab7fa91a09ef61ff8ecc5815def9631ab5ee83a4309f737 SHA512 ebd3c11faa7091f5c7d9265f3da99cba12b4c08bd126c50f2717664756695b8b417f89324f40d5327f591c8f55a3dba8a6cf78d6bb9bffed466a1564c0075b48 WHIRLPOOL 7695ce9135a352b63cccd3c4ac58919d71ce6e6784d264fecdd7dacf40079767938b36f87a63f43ba490a8224890be9f586bfa804c99e13151a4dcf21374f40d
--- a/dev-java/charva/charva-1.1.4-r1.ebuild
+++ b/dev-java/charva/charva-1.1.4-r1.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="A Java Windowing Toolkit for Text Terminals"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}/charva.zip -> ${P}.zip"
-HOMEPAGE="http://www.pitman.co.za/projects/charva/"
-RDEPEND=">=virtual/jre-1.5
-		sys-libs/ncurses
-		dev-java/commons-logging:0"
-DEPEND=">=virtual/jdk-1.5
-		app-arch/unzip
-		${RDEPEND}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-respect-flags.patch
-
-	rm -v ./c/lib/*.so || die
-	rm -v java/lib/* || die
-	rm -v java/dist/lib/* || die
-	find . -name "*.class" -print -delete || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-logging"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd c/src
-	emake CC="$(tc-getCC)" INCLUDES="$(java-pkg_get-jni-cflags)" -f Makefile.linux.txt
-}
-
-src_install() {
-	java-pkg_dojar ./java/dist/lib/charva.jar
-	use doc && java-pkg_dojavadoc docs/api
-	use examples && java-pkg_doexamples test/src/example
-	use source && java-pkg_dosrc java/src/{charva,charvax}
-
-	java-pkg_doso c/lib/*.so
-}
--- a/dev-java/charva/files/charva-respect-flags.patch
+++ b/dev-java/charva/files/charva-respect-flags.patch
@ -1,27 +0,0 @@
--- c/src/Makefile.linux.txt
-+++ c/src/Makefile.linux.txt
-@@ -5,14 +5,14 @@
- SHARED_OBJECT_EXT = so
- TARGET = libTerminal.${SHARED_OBJECT_EXT}
- 
-CC = gcc
-+CC ?= gcc
- # "-D_USE_NCURSESW" was added for handling UTF-8 characters (contributed by Leos Urban)
-CFLAGS = -fpic -shared -D_USE_NCURSESW_
-+CFLAGS += -fpic -shared -D_USE_NCURSESW_
- 
- # The file "jni.h" is in ${JAVA_HOME}/include
- # The file "jni_md.h" (included from jni.h) contains machine-dependent 
- # type definitions and is in ${JAVA_HOME}/include/${OS}
-INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include
-+INCLUDES ?= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include
- 
- # Changed "-lncurses" to "-lncursesw" (Leos Urban)
- LIBS = -lncursesw
-@@ -21,5 +21,5 @@
- all : ${TARGET}
- 
- ${TARGET} : Toolkit.c ../include/charva_awt_Toolkit.h Makefile.${OS}.txt
-	${CC} ${CFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}
-+	${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}
- 
--- a/dev-java/freehep-export/Manifest
+++ b/dev-java/freehep-export/Manifest
@ -1 +0,0 @@
-DIST freehep-export-2.1.1-sources.jar 11634 SHA256 c82928fb1c5bf8e6f2787a6847230f071904350d59ea6e9bf3e13d8b3f2ba3cb SHA512 32ef3c5b7a8a741af7ebaff0a9043f4211ba7a2369e6d3c3100240dffce37c0f38c39fbae1b0ca206f0546407ab94ee1b795c7004dbdbacd1d48039f3762e301 WHIRLPOOL b61bc5058796c912dbccc2dd887f3e64105280115ae074b0ae751d91d06e634817c2cef820fae2cc235a3779ebc2e72bbece7630c10295ac419346bc1530e396
--- a/dev-java/freehep-export/freehep-export-2.1.1.ebuild
+++ b/dev-java/freehep-export/freehep-export-2.1.1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Export and Save As Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-swing-2.0.3
-	dev-java/freehep-misc-deps
-	dev-java/freehep-util"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-swing,freehep-misc-deps,freehep-util"
--- a/dev-java/freehep-export/metadata.xml
+++ b/dev-java/freehep-export/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-graphics2d/Manifest
+++ b/dev-java/freehep-graphics2d/Manifest
@ -1 +1,2 @@
-DIST freehep-graphics2d-2.1.1-sources.jar 85104 SHA256 08a34bd74c4b263a3ccdae1d3e578f52a57473bbb248eaeac5b39c165f57a281 SHA512 18c93af064cdf4edb2d5cbdc7ed7eae57dbe472720bf197b7ea35fc884b3ece6dfb383e4e56d86b7d1c78ca1f5427f471d862dbc82d5538c2e1848b665376c36 WHIRLPOOL d0f21489f84dd96254c9b997148c685fc7caeb11c78b06d3bf6947db32f364a60d9b3007ada381445c99ecccb172217e5e44427ba1580c20e82f4bc4014e0895
+DIST freehep-chartable-converter-plugin-2.2.1.tar.gz 18159 SHA256 076086b08f775ad52a1ce58389167f048f594864ad6b198c92d540a30f96ae35 SHA512 4caac8b83b9efdee59e2a801bb001fdf7bab144bb5734bdb89ef3e1163bc9ffd05b2c8c59d611665573c432045a854fba28eb4d24260baea5286b34ae298add1 WHIRLPOOL a97d2c8685c29ae7d1dccf653577dd15cf085cf5439744f5c0dd904ebb8d85d9a6e6e825059230bc2baf4e519b87bfda136db2fac22202d878ae84b0382503bc
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
--- a/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics 2D Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-util-2.0.2"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-util"
--- a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CHARTABLE_PN="freehep-chartable-converter-plugin"
+CHARTABLE_P="${CHARTABLE_PN}-2.2.1"
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics 2D Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz
+	https://github.com/freehep/${CHARTABLE_PN}/archive/${CHARTABLE_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphicsbase-${PV}:${SLOT}"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphicsbase"
+
+src_compile() {
+	# This package uses a custom Maven plugin to generate some
+	# sources. We're not using Maven but we can run it manually. We
+	# could package the plugin separately but it's not used elsewhere.
+
+	local SRC ENC CP="${WORKDIR}"/${CHARTABLE_PN}-${CHARTABLE_P}/src/main/java CLASS=org/freehep/graphics2d/font/encoding/CharTableConverter
+	ejavac "${CP}/${CLASS}.java"
+
+	for SRC in src/main/encoding/{Expert,Symbol,Zapfdingbats}.utf-16; do
+		ebegin "Converting ${SRC}"
+		java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} || die
+		eend $?
+	done
+
+	SRC=src/main/encoding/Latin.utf-16
+
+	for ENC in ISO MAC WIN PDF STD; do
+		ebegin "Converting ${SRC} (${ENC})"
+		java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} ${ENC} || die
+		eend $?
+	done
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "Test*.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
--- a/dev-java/freehep-graphics2d/metadata.xml
+++ b/dev-java/freehep-graphics2d/metadata.xml
@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/freehep-graphicsbase/Manifest
+++ b/dev-java/freehep-graphicsbase/Manifest
@ -0,0 +1 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
--- a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
+++ b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics Base Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/freehep-io:0
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-io,junit-4"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "ExportFileTypeTest.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
--- a/dev-java/freehep-graphicsbase/metadata.xml
+++ b/dev-java/freehep-graphicsbase/metadata.xml
@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">charva</remote-id>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-java/freehep-graphicsio-emf/Manifest
+++ b/dev-java/freehep-graphicsio-emf/Manifest
@ -1 +1 @@
-DIST freehep-graphicsio-emf-2.1.1-sources.jar 131325 SHA256 c7b32d145be3aedf8adfe679359852c5dc8994d3a70b55f32bfeae85ebb3d629 SHA512 d5f971bb9ff8c5860b26e2e6cb02453db7a088349a2ce9840f8375b586f7911f5f1640b8e47e11c1afd8d7f04934f5f68722f276b22e8a0c28ef3d080d329cad WHIRLPOOL 8b505aaee85196dfb4b6912cfdcb9297a979ea1cf236f5a33c2664263d525012b80dad8180038f2427362ef314b637ceeb009fd47980f42e6d956d634873baf4
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
--- a/dev-java/freehep-graphicsio-emf/files/github-30.patch
+++ b/dev-java/freehep-graphicsio-emf/files/github-30.patch
@ -0,0 +1,34 @@
+https://github.com/freehep/freehep-vectorgraphics/issues/30
+
+diff -Naur freehep-vectorgraphics-freehep-vectorgraphics-2.4.orig/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java freehep-vectorgraphics-freehep-vectorgraphics-2.4/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java
+--- freehep-vectorgraphics-freehep-vectorgraphics-2.4.orig/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java	2014-09-02 09:59:14.000000000 +0100
+++ freehep-vectorgraphics-freehep-vectorgraphics-2.4/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java	2016-05-25 22:50:41.859734476 +0100
+@@ -4,6 +4,7 @@
+ import org.freehep.graphicsbase.util.export.ExportFileType;
+ 
+ import java.util.List;
+import java.util.Properties;
+ import java.io.FileInputStream;
+ import java.io.File;
+ 
+@@ -64,9 +65,10 @@
+                 destFileName += type.toLowerCase();
+             }
+ 
+            Properties p = new Properties();
+
+             // TODO there is no possibility to use Constants of base class!
+             /* create SVG properties
+-            Properties p = new Properties();
+             p.put(SVGGraphics2D.EMBED_FONTS, Boolean.toString(false));
+             p.put(SVGGraphics2D.CLIP, Boolean.toString(true));
+             p.put(SVGGraphics2D.COMPRESS, Boolean.toString(false));
+@@ -82,7 +84,7 @@
+                new File(destFileName),
+                emfPanel,
+                emfPanel,
+-               null,
+               p,
+                "Freehep EMF converter");
+         } catch (Exception e) {
+             e.printStackTrace();
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-util-2.0.2
-	>=dev-java/freehep-graphicsio-2.1.1
-	>=dev-java/freehep-graphicsio-tests-2.1.1
-	dev-java/jdom
-	dev-java/junit
-	dev-java/freehep-misc-deps
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-util,freehep-graphicsio,freehep-graphicsio-tests,jdom-1.0,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? (
+		~dev-java/freehep-graphicsio-tests-${PV}:${SLOT}
+		dev-java/junit:4
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io"
+
+java_prepare() {
+	epatch "${FILESDIR}"/github-30.patch
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-optional-dependency freehep-graphicsio-svg
+	java-pkg_dolauncher emf2svg --main org.freehep.graphicsio.emf.EMF2SVG
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,freehep-graphicsio-tests,${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" org.freehep.graphicsio.emf.test.EMFTestSuite
+}
--- a/dev-java/freehep-graphicsio-emf/metadata.xml
+++ b/dev-java/freehep-graphicsio-emf/metadata.xml
@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/freehep-graphicsio-java/Manifest
+++ b/dev-java/freehep-graphicsio-java/Manifest
@ -1 +0,0 @@
-DIST freehep-graphicsio-java-2.1.1-sources.jar 15769 SHA256 4c17cd226f155af13524184107e5da6b1a12817eb16fc92b0f5d90471c46686f SHA512 2418e985671f64b5eb7b433760f7049b91c9542f06d9e610fbb044a8d75be071f88e1e8a1e90e5fb025538841b642315a85afd3a39592e8b3742686348e1181f WHIRLPOOL 563bb0ce94a08cb181aa51d39cb927cff670e22fae8a38006bf5ce34785bfd77a82dbd14a12f3f5d70fa4edc1cbe3fd4ec9c3286195d8ddf9bafdc406e537589
--- a/dev-java/freehep-graphicsio-java/freehep-graphicsio-java-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio-java/freehep-graphicsio-java-2.1.1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Java Driver"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
-	>=dev-java/freehep-graphicsio-tests-2.1.1
-	dev-java/junit
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
--- a/dev-java/freehep-graphicsio-java/metadata.xml
+++ b/dev-java/freehep-graphicsio-java/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-graphicsio-pdf/Manifest
+++ b/dev-java/freehep-graphicsio-pdf/Manifest
@ -1 +0,0 @@
-DIST freehep-graphicsio-pdf-2.1.1-sources.jar 45381 SHA256 d1aebea3833c8b54c4bdb640a62733f3b02b4afabe19544cb22f65bbaa9d4aaf SHA512 e6e54998b80466d750a6b7bb33d3c1c68903213a474a02d8baf36fedacbab3b8f5c4291b26ba9f0206219b0f3737b14e11d3e97b7a3f25d951a4fda93ea2c2c4 WHIRLPOOL faccf1c0dcd924be2ebb6e4f977e5d6567d65b9350a246c5cd10dd53dd5eb075ea0df79ef0a2d3e79f70860642d47f09afd069a9f6c06f8400f45cadfd8b4256
--- a/dev-java/freehep-graphicsio-pdf/freehep-graphicsio-pdf-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio-pdf/freehep-graphicsio-pdf-2.1.1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Portable Document Format Driver"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
-	>=dev-java/freehep-graphicsio-tests-2.1.1
-	dev-java/junit
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
--- a/dev-java/freehep-graphicsio-pdf/metadata.xml
+++ b/dev-java/freehep-graphicsio-pdf/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-graphicsio-ps/Manifest
+++ b/dev-java/freehep-graphicsio-ps/Manifest
@ -1 +0,0 @@
-DIST freehep-graphicsio-ps-2.1.1-sources.jar 35182 SHA256 b30dd04bc787e3d31d1ff72918dba95a51a9720fc7f5f5d285c584749c75ed6b SHA512 af1625aa40a0eb8e5c792d1f02e51e1ac485f250e192fa8b46d6e9c2837376b1dd0bfc4e2727d0a03e40ccdb34b8615330a09593387ff0febd5c846f74964e65 WHIRLPOOL 824057dc44e5b46a6ee139463065a268c1d1a575490bc20ff0c77a2448b789cea88e63eae38410170139e72eb20ede2e32af45ae76bf44e34c3b17f20d3d2cf1
--- a/dev-java/freehep-graphicsio-ps/freehep-graphicsio-ps-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio-ps/freehep-graphicsio-ps-2.1.1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP (Encapsulated) PostScript Driver"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
-	>=dev-java/freehep-graphicsio-tests-2.1.1
-	dev-java/junit
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
--- a/dev-java/freehep-graphicsio-ps/metadata.xml
+++ b/dev-java/freehep-graphicsio-ps/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-graphicsio-svg/Manifest
+++ b/dev-java/freehep-graphicsio-svg/Manifest
@ -1 +1 @@
-DIST freehep-graphicsio-svg-2.1.1-sources.jar 16943 SHA256 f9182db42a831634792144e9937c7669f54ca03e79af02441f08833d89cb1647 SHA512 da5959f58ba315d163eeee0b6ca5cb39d2f5b608117091d4257c7f791b16e8626e27c82f59b2ff547258c150b40096d311ecf7d5148e59daaa5e67d94dad2e8f WHIRLPOOL 46cf8fcd83775ac04b32e682d6f734fac797139e1bf8f8e074b57d4683dd2402d8aaf70de00b8b95429bcb9c859090b11a74c33ebcc303429e7f61e07713b611
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
--- a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Scalable Vector Graphics Driver"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/freehep-xml
-	>=dev-java/freehep-graphicsio-2.1.1
-	>=dev-java/freehep-graphicsio-tests-2.1.1
-	dev-java/junit
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-xml,freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
--- a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Scalable Vector Graphics Driver"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? (
+		~dev-java/freehep-graphicsio-tests-${PV}:${SLOT}
+		dev-java/junit:4
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,freehep-graphicsio-tests,${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" org.freehep.graphicsio.svg.test.SVGTestSuite
+}
--- a/dev-java/freehep-graphicsio-svg/metadata.xml
+++ b/dev-java/freehep-graphicsio-svg/metadata.xml
@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/freehep-graphicsio-swf/Manifest
+++ b/dev-java/freehep-graphicsio-swf/Manifest
@ -1 +0,0 @@
-DIST freehep-graphicsio-swf-2.1.1-sources.jar 81470 SHA256 f360351e8c35d82beb5a4b77da00a9268c4a59abd84a47c9cc855339a7300504 SHA512 4e0ca9c1cc83e2e06bc578e10807ef094fda789f53796444ea9d81b0bb0730ff53c4fce5c942c9911b8475706ad3e92e94645ce78e2291793d170c28c85c4dc4 WHIRLPOOL b79c9da87063aa7c99dc5e94be23961f0d53f26c931bd264b4fba9cd09417883b979a06ca2653d805c59b8bf1bb8bf07e92770277b1f453e5730ad3178dfce2a
--- a/dev-java/freehep-graphicsio-swf/freehep-graphicsio-swf-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio-swf/freehep-graphicsio-swf-2.1.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP SWF (Flash) Driver"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
-	>=dev-java/freehep-graphicsio-tests-2.1.1
-	dev-java/junit
-	dev-java/freehep-misc-deps
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
--- a/dev-java/freehep-graphicsio-swf/metadata.xml
+++ b/dev-java/freehep-graphicsio-swf/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-graphicsio-tests/Manifest
+++ b/dev-java/freehep-graphicsio-tests/Manifest
@ -1 +1 @@
-DIST freehep-graphicsio-tests-2.1.1-sources.jar 66076 SHA256 bcde7ffa56ed65195462fec89cb6b17c9701360831e7e0d37e9b4e275d9c5bf9 SHA512 a29110346620c249000e06873a4905c56f71f54f278423edb07d860f13466c71dedcb70affc3ed53d6a9f6e404583aed0feebe944c6b741e755186306b94acb4 WHIRLPOOL d6ed888e90692c047c1799c6e922ab4b5460ca776b55278f6fdfabc0acde34c58149583c2eb263754b06a51e975d8d7fec0a467c2e71f6280ccd03ce82f6d3f1
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
--- a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.1.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Test Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/freehep-export
-	>=dev-java/freehep-graphicsio-2.1.1
-	dev-java/junit
-	dev-java/freehep-misc-deps
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-export,freehep-graphicsio,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
--- a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Test Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io,junit-4"
+
+java_prepare() {
+	# Avoid additional deps for "extra" tests.
+	sed -i -r "/Test(Histogram|ScatterPlot)/d" \
+		${JAVA_SRC_DIR}/org/freehep/graphicsio/test/TestSuite.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
--- a/dev-java/freehep-graphicsio-tests/metadata.xml
+++ b/dev-java/freehep-graphicsio-tests/metadata.xml
@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/freehep-graphicsio/Manifest
+++ b/dev-java/freehep-graphicsio/Manifest
@ -1 +1 @@
-DIST freehep-graphicsio-2.1.1-sources.jar 636244 SHA256 744fe063505a492fb0fccb0a8890a5cb8a20a9c30276d676ca5bcf6bb2d859bd SHA512 ea6df974c0e7c1fa6ad72dc698434d9c33030a55d0f6cd96b5b5b381ef29ad7d88f25c09581056ef015acfd8a53fb8cb84151fe9748e5d30f8454c1bd14f643e WHIRLPOOL 34fd59acd8556f9b86e72d305db875c81f38b59b82a7618cf1f7b6470bd4fed8eb70a9feaa90591151866972a67c25a4a7f40ca7893c32eb433dabea986265cd
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Base Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-graphics2d-2.1.1
-	dev-java/freehep-export
-	dev-java/freehep-io
-	dev-java/freehep-util
-	dev-java/freehep-swing"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-export,freehep-io,freehep-util,freehep-swing"
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Base Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-io"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
--- a/dev-java/freehep-graphicsio/metadata.xml
+++ b/dev-java/freehep-graphicsio/metadata.xml
@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/freehep-io/Manifest
+++ b/dev-java/freehep-io/Manifest
@ -1 +1 @@
-DIST freehep-io-2.0.2-sources.jar 58815 SHA256 806f3404bb1d29a68d5bf198611ce1634cb3296f533430edababab35d77b19ea SHA512 a04e39ffeb69c215f897d09e1adeb083477cd54d1ea5e73bbbac7161c54d181db70d690e4684871eaf137ece3c056862f8ab8a460f6de91d3e072ac84d6c1e82 WHIRLPOOL 6b30c46840a99b5e9d13dde5ab474d51ba748ba1b4b2f795a45b1748e6e508ff8acb1a6485ff40fe57ad78e3cf1b733b3f81d1ea6e2f55d8b484b930b67c08f6
+DIST freehep-io-2.2.2.tar.gz 76935 SHA256 dd66232e8c484d35a732f05e04834d520a04769f4bc86c6eeaee764bf96f511b SHA512 1cc7cab3d9648b119aa8c637c84cd985adc0f9dd2cdd153021500831325d719ef5fa41d8964ccbeed3af95b87e09c4886597c0ede1370a209f6807932636b0ee WHIRLPOOL db39f0e68e17416d2893462c554983c8eaa8831e505b6868ce29c03ed6c2d99f446d5e752f6d6ac5cb69d9daf9c16720a1941bdbdaf8e985dab6c838497fe518
--- a/dev-java/freehep-io/freehep-io-2.0.2.ebuild
+++ b/dev-java/freehep-io/freehep-io-2.0.2.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-util-2.0.1
-	dev-java/junit"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-util,junit"
--- a/dev-java/freehep-io/freehep-io-2.2.2.ebuild
+++ b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
--- a/dev-java/freehep-io/metadata.xml
+++ b/dev-java/freehep-io/metadata.xml
@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-io</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/freehep-mcfio/Manifest
+++ b/dev-java/freehep-mcfio/Manifest
@ -1 +0,0 @@
-DIST freehep-mcfio-2.0.1-sources.jar 11234 SHA256 f46536d338a45c0e00ca3375502e72cc46853b0063d1b2f3662b46b2660b0f32 SHA512 e1d8fb8ff369b0209e3660b05383bd4347f5dcdb5845ddba64c4fb9c22840cbeb71bf6e05fb180d98b2c04a5e08c09c443ea6dcf18c790d46fbaf7eca7efbfca WHIRLPOOL 56e0fbfd95c4ba34c7947326470504cb1faa46135a2f042de1874f39a172533671af631117535319d60caca445bee64882ec4362856d1f683cefebf4912993f8
--- a/dev-java/freehep-mcfio/freehep-mcfio-2.0.1.ebuild
+++ b/dev-java/freehep-mcfio/freehep-mcfio-2.0.1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP MCFIO Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-xdr-2.0.3
-	>=dev-java/junit-3.8.2"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-xdr,junit"
--- a/dev-java/freehep-mcfio/metadata.xml
+++ b/dev-java/freehep-mcfio/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-misc-deps/Manifest
+++ b/dev-java/freehep-misc-deps/Manifest
@ -1,6 +0,0 @@
-DIST JAS-1.0.hbook 1691648 SHA256 d71ecf58ac7f9915ea1620d7e8948f81dc6b50fa800bf33f09b90afdaf221e61 SHA512 13199071bd97cb69518cc57419897d22add27e25c4e01077a2447209d5b31aadb50b4b4eed07746e6fff84fef951548e6d78c2694166df77a8362224096e7190 WHIRLPOOL bbf43eed14a9ee00b41814bc2971d1e010adfbf683f803c59c929b178a8e539bdea81efa59265972e33887ddb072c26ac5e6b631b51453d848602affecc17207
-DIST aida-3.3.jar 41867 SHA256 32f971b6ade56fa441e93747a96f69da6e7f5b3ffe6721407f0aee9784d5e3fd SHA512 70f48b5550e7e24725b1928306947cbf343f516371888a09d8b610c681149db6b69dee9fffd453f857c932d947471fb76ee7692009c00de34f40dc7f78445a73 WHIRLPOOL 03c41343f180172d11ea4c2d414307d6b9c08387e1fbdfb32f67714a32e22aecaac4ba1f7a192636fd845aef8f57e3623668b52ec4ccabe04c75b372c3e28976
-DIST jas-plotter-2.2.3.jar 671548 SHA256 986c99b1aa3115d638c832285a37427eeebf98abced89d414727c6b920a8a6b1 SHA512 6e06d896e8059e9bf4c4cd9eb32b8b89024af5415d68def1698f7f33c75ac3dacb2c466c822613abfe90774718c4d45352d350ffd4953d9a9bfe5718171e9c43 WHIRLPOOL ce1adf5afb867da4b192476cbbf3ee0768956c3cea6259b7d01a757dec8e9c55ae7338c794f6903a72b06152ae2b2166db4ce7e3dbc13dbd8fe73d9b6158734c
-DIST openide-lookup-1.9-patched-1.0.jar 64747 SHA256 ce688d226b48f28284550b82fc9d0d6e0f4f94e546df818455b6aeec3eb9dbd4 SHA512 c00f16a954b60bee2181b30fefd6b7b22ae20e1082309e3668df0b46dfa69bb814bab5281b2f4b9b0ede316979870692dd649aa444203af54ead6a593fb091ac WHIRLPOOL 10685deb0ad2c47054c011f9c801111f81ed336622d89d99a657a6a1fdad960c717f03f438e80a3cf39ef68822bc64eed6a3dccd7b88e38be3a4abc8bebab6ee
-DIST pawdemo-1.0.hbook 520192 SHA256 dd7001ce86a60cd7c6b912d1402d726d379e67d3cb70caf1a0f8e1a432c8bd89 SHA512 c936341d504e0bb6224306ddf04bae4133d66ceaaede73b28bc737e976d0e95e5427a1170536829bf4858a8c55867a6a6a67c9deb7410b5c61536ded06ccc807 WHIRLPOOL 947850851eaa85185674f7b276fddc42582ee94a0afb1e5190200664dcf4a0a30379b8698cda1aa222aab10250126b8e0c9d3d69a0b5bb3bef975a7f6a3957e8
-DIST rowwise-1.0.hbook 1384448 SHA256 c766e1353050dbeace6e82663a540c6e0e50a682c868fcc6bc2f715edc4acbb1 SHA512 2a7fc15020524e05ada2830dd4f8b63a7883713150269d4fc98da1f7e46e840a5b2b30814b586edb22835aa2a3f07d1b91884f0d537775cbd281923bd7c1fbbb WHIRLPOOL 0eb44ad786829f2187c42b7819a2e546ba35498be271a5fde1401235d0143fbbeae38707335b293ccb9614614685b1db5730d55f4605d95652b47cd82f508de7
--- a/dev-java/freehep-misc-deps/freehep-misc-deps-0.1.ebuild
+++ b/dev-java/freehep-misc-deps/freehep-misc-deps-0.1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-
-inherit java-pkg-2
-
-DESCRIPTION="High Energy Physics Java library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_URI="http://java.freehep.org/maven2/org/netbeans/openide-lookup/1.9-patched-1.0/openide-lookup-1.9-patched-1.0.jar
-	http://java.freehep.org/maven2/org/freehep/jas-plotter/2.2.3/jas-plotter-2.2.3.jar
-	http://java.freehep.org/maven2/hep/aida/aida/3.3/aida-3.3.jar
-	http://java.freehep.org/maven2/hep/testdata/hbook/JAS/1.0/JAS-1.0.hbook
-	http://java.freehep.org/maven2/hep/testdata/hbook/pawdemo/1.0/pawdemo-1.0.hbook
-	http://java.freehep.org/maven2/hep/testdata/hbook/rowwise/1.0/rowwise-1.0.hbook"
-
-COMMON_DEP=""
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-JAVA_GENTOO_CLASSPATH=""
-
-src_install() {
-	java-pkg_dojar "${DISTDIR}/openide-lookup-1.9-patched-1.0.jar"
-	java-pkg_regjar "/usr/share/${PN}/lib/openide-lookup-1.9-patched-1.0.jar"
-	java-pkg_dojar "${DISTDIR}/jas-plotter-2.2.3.jar"
-	java-pkg_regjar "/usr/share/${PN}/lib/jas-plotter-2.2.3.jar"
-	java-pkg_dojar "${DISTDIR}/aida-3.3.jar"
-	java-pkg_regjar "/usr/share/${PN}/lib/aida-3.3.jar"
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}/JAS-1.0.hbook"
-	doins "${DISTDIR}/pawdemo-1.0.hbook"
-	doins "${DISTDIR}/rowwise-1.0.hbook"
-}
--- a/dev-java/freehep-misc-deps/metadata.xml
+++ b/dev-java/freehep-misc-deps/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-parameterdatabase/Manifest
+++ b/dev-java/freehep-parameterdatabase/Manifest
@ -1 +0,0 @@
-DIST freehep-parameterdatabase-2.0-sources.jar 24780 SHA256 4dbc7d7b0323e475df61d86438096f06c2d0c2271047dfaaf7eba426ed8c7925 SHA512 f0df967d856c5dfa5ebbc1097988de0678e42d2a1898cc0120e949b446fec4e825adab48010dbb31d6bba1d3ae301f92abf74045f12e5ab987e14f67ea675c39 WHIRLPOOL fef8264e77e8127d5a4220c34f1966bb8bfc29ec62620d54adcba7dc23e06dfd1203d192424c6a63d1651398cd9449b7dc26d80bea97458c58cdcbb25003bde8
--- a/dev-java/freehep-parameterdatabase/freehep-parameterdatabase-2.0.ebuild
+++ b/dev-java/freehep-parameterdatabase/freehep-parameterdatabase-2.0.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Parameter and Settings Database"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-swing-2.0.3
-	>=dev-java/freehep-xml-2.1.2"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-swing,freehep-xml"
--- a/dev-java/freehep-parameterdatabase/metadata.xml
+++ b/dev-java/freehep-parameterdatabase/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-record/Manifest
+++ b/dev-java/freehep-record/Manifest
@ -1 +0,0 @@
-DIST freehep-record-2.0-sources.jar 46489 SHA256 d5c656233aacea65d6e07b2cc4b18b5c1d1e3cf7263e462cc2e0ec6befd8ebd9 SHA512 d6090d60fac9db82ce8d9232cb51fa8a9657982e0efdeff2f317570d29fcd8cbf8df9b498278595cc2b293d14d0c63f9a7b6ba9e774a4a72d96570763bcfae87 WHIRLPOOL af7ac978163e3057737c87af6fda4b303c1a8020608842a9741383126bbf71c6b422cf6baca8b32980470bf03ab3c81be14b4bf2864963bb6b9d4bb82c204796
--- a/dev-java/freehep-record/freehep-record-2.0.ebuild
+++ b/dev-java/freehep-record/freehep-record-2.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Record Manipulation Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/junit"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="junit"
--- a/dev-java/freehep-record/metadata.xml
+++ b/dev-java/freehep-record/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-rootio/Manifest
+++ b/dev-java/freehep-rootio/Manifest
@ -1 +0,0 @@
-DIST freehep-rootio-2.0.9-sources.jar 166875 SHA256 a04c451c5ced3a685c6efa6dd081c90b160aabd8234bbd04c99462a50ac6c68e SHA512 37abb16c0fe66fd06d23b50491cfc9573d8478700d3023bce183c7ee4a5a8ccdc31be4d62f7b3f8c599131fccd348f213c7e6debe2138725434f9ae97bf52f95 WHIRLPOOL ac46c54f4dff489ab879522abe3c17870f223c983486c3cb4edfb1b1ccab2dc38703e9f7d28f126060d7fc23833889fccd4798ba248d1050109081035704ed4e
--- a/dev-java/freehep-rootio/freehep-rootio-2.0.9.ebuild
+++ b/dev-java/freehep-rootio/freehep-rootio-2.0.9.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP ROOT IO Reader and Writer"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/bcel-5.2
-	dev-java/freehep-misc-deps
-	>=dev-java/junit-3.8.2"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="bcel,freehep-misc-deps,junit"
--- a/dev-java/freehep-rootio/metadata.xml
+++ b/dev-java/freehep-rootio/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-rtti/Manifest
+++ b/dev-java/freehep-rtti/Manifest
@ -1 +0,0 @@
-DIST freehep-rtti-2.0.1-sources.jar 12867 SHA256 11326221f5b721bc9c455c221645fa7934300364bc289c3d15937e0e3df1e05a SHA512 4b6e76ecb46cef83884d3eefb60af5f4efed181364ff8a07f23dab1422752af8eada2f4c8b988fb3934ae847d39e38d8194ade9ac9435b09eaadc077fb82e423 WHIRLPOOL 382bf6e8058b228dcfa5ea814f0d829a9de7bfdf6fd78d83218dae6149e0317d6b43904892ad01a8f3e9cb125ef360ffde6a93f23aef9081e4e8365739d695cc
--- a/dev-java/freehep-rtti/freehep-rtti-2.0.1.ebuild
+++ b/dev-java/freehep-rtti/freehep-rtti-2.0.1.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - Runtime Type Identification Object Model and API"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/bcel"
-
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="bcel"
--- a/dev-java/freehep-rtti/metadata.xml
+++ b/dev-java/freehep-rtti/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-sio/Manifest
+++ b/dev-java/freehep-sio/Manifest
@ -1 +0,0 @@
-DIST freehep-sio-2.0-sources.jar 5523 SHA256 733a3723c5cfb4fafbd077da54f2f7c2b733a379294a64e904816455bf66f258 SHA512 35cded48b7c5c4248277b05e1748d1b7cb5eec005a5f72a658c6fb5c6d848b816189701ea732c4dd5c15aa580fcb2717485e39ffa15ceb00ae6eaf730c8d8ea8 WHIRLPOOL eb5266d32fc34cdad1400864d18094be09dbc911606b7627ac27f80fba22ee5801f98e5f706fe3c2b8288a84243fca6296b894274ddc2ff7aed771adfa63a339
--- a/dev-java/freehep-sio/freehep-sio-2.0.ebuild
+++ b/dev-java/freehep-sio/freehep-sio-2.0.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP SIO Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-xdr-2.0.3
-	>=dev-java/junit-3.8.2"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-xdr,junit"
--- a/dev-java/freehep-sio/metadata.xml
+++ b/dev-java/freehep-sio/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-stdhep/Manifest
+++ b/dev-java/freehep-stdhep/Manifest
@ -1 +0,0 @@
-DIST freehep-stdhep-2.0.2-sources.jar 8262 SHA256 a7006a8fbedd2af4fd35048ceb9d69e44d4aa7b70364d1882ddb7a8c0c80ce53 SHA512 81db0afd70f435ca5495e24557b6490240440fb98c10d4cf113e5d45a0b0fb7be3695ba4f9102ca29a6c042cfd842c606766ff18070d699c82cb24125a01abe4 WHIRLPOOL be19d7a1102fab6f4e6dc7f9991710ec52f7479ad193070b01b8f4493a0d1a19e09721f2254af9768d4243cb1a758f18ebe71655de155e3ec304762d4c096a3b
--- a/dev-java/freehep-stdhep/freehep-stdhep-2.0.2.ebuild
+++ b/dev-java/freehep-stdhep/freehep-stdhep-2.0.2.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP STDHep IO Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-mcfio-2.0.1
-	>=dev-java/junit-3.8.2
-	dev-java/freehep-xdr"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-mcfio,junit,freehep-xdr"
--- a/dev-java/freehep-stdhep/metadata.xml
+++ b/dev-java/freehep-stdhep/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-swing/Manifest
+++ b/dev-java/freehep-swing/Manifest
@ -1 +0,0 @@
-DIST freehep-swing-2.0.3-sources.jar 169216 SHA256 088a054a1550f28523a3a6078b826eaa0242023a869576514c6feb0039525465 SHA512 0e8d61c7c88684b284982c71de66cc2f306af59f1c7617b5acc28794d8a723faa54b69e2ce466abb35278ce70b48db1d89c71f9d9a9eca987538b02bfc17ab22 WHIRLPOOL 685c2a0417278534cc00df84a133588ceca61a2b077a4551895da0cfdaf3eb70063e29401d31707576383c9abbf9175e9366702ee173bf0b0241cc52d930390e
--- a/dev-java/freehep-swing/freehep-swing-2.0.3.ebuild
+++ b/dev-java/freehep-swing/freehep-swing-2.0.3.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Swing Extensions"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/junit
-	>=dev-java/freehep-util-2.0.2"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="junit,freehep-util"
--- a/dev-java/freehep-swing/metadata.xml
+++ b/dev-java/freehep-swing/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-java/freehep-util/Manifest
+++ b/dev-java/freehep-util/Manifest
@ -1 +0,0 @@
-DIST freehep-util-2.0.2-sources.jar 33758 SHA256 6fa9d0e26235c7a5a1026390a6d60c3506b6b0033a4d9443f0abee5e2390e6d9 SHA512 79b4d793d5bc250ec72a9e690fd47121bbd589fc764eeed7cf77cd20d85c9010057828ea01d231c48e7b2274e3a05361c640c741fce6025044227fd8005c5939 WHIRLPOOL 1099c521ab6e6e4b066932d124018e7e0dcd9ccbaebed4d1534125eae65410a3ff41b3b5b1f0b73a94ce58ca05393c55af24b986aee9d0a428aeb74a4ecd4014
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST charva-1.1.4.zip 2100886 SHA256 cc62e83e80efb7ddfab7fa91a09ef61ff8ecc5815def9631ab5ee83a4309f737 SHA512 ebd3c11faa7091f5c7d9265f3da99cba12b4c08bd126c50f2717664756695b8b417f89324f40d5327f591c8f55a3dba8a6cf78d6bb9bffed466a1564c0075b48 WHIRLPOOL 7695ce9135a352b63cccd3c4ac58919d71ce6e6784d264fecdd7dacf40079767938b36f87a63f43ba490a8224890be9f586bfa804c99e13151a4dcf21374f40d`
				`@ -1 +0,0 @@`
				`DIST freehep-export-2.1.1-sources.jar 11634 SHA256 c82928fb1c5bf8e6f2787a6847230f071904350d59ea6e9bf3e13d8b3f2ba3cb SHA512 32ef3c5b7a8a741af7ebaff0a9043f4211ba7a2369e6d3c3100240dffce37c0f38c39fbae1b0ca206f0546407ab94ee1b795c7004dbdbacd1d48039f3762e301 WHIRLPOOL b61bc5058796c912dbccc2dd887f3e64105280115ae074b0ae751d91d06e634817c2cef820fae2cc235a3779ebc2e72bbece7630c10295ac419346bc1530e396`
				`@ -0,0 +1 @@`
				`DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76`
				`@ -1 +0,0 @@`
				`DIST freehep-graphicsio-java-2.1.1-sources.jar 15769 SHA256 4c17cd226f155af13524184107e5da6b1a12817eb16fc92b0f5d90471c46686f SHA512 2418e985671f64b5eb7b433760f7049b91c9542f06d9e610fbb044a8d75be071f88e1e8a1e90e5fb025538841b642315a85afd3a39592e8b3742686348e1181f WHIRLPOOL 563bb0ce94a08cb181aa51d39cb927cff670e22fae8a38006bf5ce34785bfd77a82dbd14a12f3f5d70fa4edc1cbe3fd4ec9c3286195d8ddf9bafdc406e537589`
				`@ -1 +0,0 @@`
				`DIST freehep-graphicsio-pdf-2.1.1-sources.jar 45381 SHA256 d1aebea3833c8b54c4bdb640a62733f3b02b4afabe19544cb22f65bbaa9d4aaf SHA512 e6e54998b80466d750a6b7bb33d3c1c68903213a474a02d8baf36fedacbab3b8f5c4291b26ba9f0206219b0f3737b14e11d3e97b7a3f25d951a4fda93ea2c2c4 WHIRLPOOL faccf1c0dcd924be2ebb6e4f977e5d6567d65b9350a246c5cd10dd53dd5eb075ea0df79ef0a2d3e79f70860642d47f09afd069a9f6c06f8400f45cadfd8b4256`
				`@ -1 +0,0 @@`
				`DIST freehep-graphicsio-ps-2.1.1-sources.jar 35182 SHA256 b30dd04bc787e3d31d1ff72918dba95a51a9720fc7f5f5d285c584749c75ed6b SHA512 af1625aa40a0eb8e5c792d1f02e51e1ac485f250e192fa8b46d6e9c2837376b1dd0bfc4e2727d0a03e40ccdb34b8615330a09593387ff0febd5c846f74964e65 WHIRLPOOL 824057dc44e5b46a6ee139463065a268c1d1a575490bc20ff0c77a2448b789cea88e63eae38410170139e72eb20ede2e32af45ae76bf44e34c3b17f20d3d2cf1`
				`@ -1 +0,0 @@`
				`DIST freehep-graphicsio-swf-2.1.1-sources.jar 81470 SHA256 f360351e8c35d82beb5a4b77da00a9268c4a59abd84a47c9cc855339a7300504 SHA512 4e0ca9c1cc83e2e06bc578e10807ef094fda789f53796444ea9d81b0bb0730ff53c4fce5c942c9911b8475706ad3e92e94645ce78e2291793d170c28c85c4dc4 WHIRLPOOL b79c9da87063aa7c99dc5e94be23961f0d53f26c931bd264b4fba9cd09417883b979a06ca2653d805c59b8bf1bb8bf07e92770277b1f453e5730ad3178dfce2a`
				`@ -1 +0,0 @@`
				`DIST freehep-mcfio-2.0.1-sources.jar 11234 SHA256 f46536d338a45c0e00ca3375502e72cc46853b0063d1b2f3662b46b2660b0f32 SHA512 e1d8fb8ff369b0209e3660b05383bd4347f5dcdb5845ddba64c4fb9c22840cbeb71bf6e05fb180d98b2c04a5e08c09c443ea6dcf18c790d46fbaf7eca7efbfca WHIRLPOOL 56e0fbfd95c4ba34c7947326470504cb1faa46135a2f042de1874f39a172533671af631117535319d60caca445bee64882ec4362856d1f683cefebf4912993f8`
				`@ -1 +0,0 @@`
				`DIST freehep-parameterdatabase-2.0-sources.jar 24780 SHA256 4dbc7d7b0323e475df61d86438096f06c2d0c2271047dfaaf7eba426ed8c7925 SHA512 f0df967d856c5dfa5ebbc1097988de0678e42d2a1898cc0120e949b446fec4e825adab48010dbb31d6bba1d3ae301f92abf74045f12e5ab987e14f67ea675c39 WHIRLPOOL fef8264e77e8127d5a4220c34f1966bb8bfc29ec62620d54adcba7dc23e06dfd1203d192424c6a63d1651398cd9449b7dc26d80bea97458c58cdcbb25003bde8`
				`@ -1 +0,0 @@`
				`DIST freehep-record-2.0-sources.jar 46489 SHA256 d5c656233aacea65d6e07b2cc4b18b5c1d1e3cf7263e462cc2e0ec6befd8ebd9 SHA512 d6090d60fac9db82ce8d9232cb51fa8a9657982e0efdeff2f317570d29fcd8cbf8df9b498278595cc2b293d14d0c63f9a7b6ba9e774a4a72d96570763bcfae87 WHIRLPOOL af7ac978163e3057737c87af6fda4b303c1a8020608842a9741383126bbf71c6b422cf6baca8b32980470bf03ab3c81be14b4bf2864963bb6b9d4bb82c204796`