Dice(kiwi) and dependencies; kiwi and dependecies (still missing zypper)

28 files changed, 733 insertions, 3 deletions

diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
new file mode 100644
index 0000000..ed1b2a3
--- /dev/null
+++ b/app-emulation/docker-compose/Manifest
@@ -0,0 +1,3 @@
+AUX docker-compose-1.24.0-setup-py.patch 1734 BLAKE2B d86f5390c38088c9050f79cc63ae50a7611e1fac4fe2441b936fb7a83a6a0160d6edb5ce0c0b7390b555d424ec55e1362bd2af6bca6937da648f408372d8d1af SHA512 8fce55493f009349a77a95e8a473bc85faa66b03773bccd30ff56d8299bf357676aecd40b2f68a44e292f79e4a28587ae479709dca428010095bda9ec220b85f
+DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c SHA512 318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa993dddd3bc2e5f23cbb76856276a874e84793b878a3e86
+EBUILD docker-compose-1.24.0-r1.ebuild 2234 BLAKE2B 2b94a3071586d66a1e1ca477bbcc4d19f13f43446095df12fdc82148bfb246207e7017607fb010ad4edc5f2a15d04687c742b970888f22b396abdfc82b41732e SHA512 0099f3002d87799e0a678591078f29d67dd7545207763b170f168b5b8aed282daaba470dc802393142fb9b5185ba49dcee1d67440fef73a4afddf73b4df59d60
diff --git a/app-emulation/docker-compose/docker-compose-1.24.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0-r1.ebuild
new file mode 100644
index 0000000..aacd6aa
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.24.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.24.0-setup-py.patch
+)
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
new file mode 100644
index 0000000..d911d19
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
@@ -0,0 +1,57 @@
+From 981faad5f67a843f2b6c44f40be4dc8d2c5156c7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 11 May 2019 00:32:22 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 8371cc7..b9e5a80 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,16 +30,15 @@ def find_version(*file_paths):
+ 
+ 
+ install_requires = [
+-    'cached-property >= 1.2.0, < 2',
+-    'docopt >= 0.6.1, < 0.7',
+-    'PyYAML >= 3.10, < 4.3',
+-    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
+-    'texttable >= 0.9.0, < 0.10',
+-    'websocket-client >= 0.32.0, < 1.0',
+-    'docker[ssh] >= 3.7.0, < 4.0',
+-    'dockerpty >= 0.4.1, < 0.5',
+-    'six >= 1.3.0, < 2',
+-    'jsonschema >= 2.5.1, < 3',
++    'docopt >= 0.6.1',
++    'PyYAML >= 3.10',
++    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
++    'texttable >= 0.9.0',
++    'websocket-client >= 0.32.0',
++    'docker[ssh] >= 3.7.0',
++    'dockerpty >= 0.4.1',
++    'six >= 1.3.0',
++    'jsonschema >= 2.5.1',
+ ]
+ 
+ 
+@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4):
+     tests_require.append('mock >= 1.0.1')
+ 
+ extras_require = {
+-    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
++    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
+     ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
+     ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
+-    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
+-    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++    ':sys_platform == "win32"': ['colorama >= 0.4'],
++    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+ }
+ 
+ 
+-- 
+2.21.0
+
diff --git a/app-text/jing/ChangeLog b/app-text/jing/ChangeLog
new file mode 100644
index 0000000..c748f65
--- /dev/null
+++ b/app-text/jing/ChangeLog
@@ -0,0 +1,110 @@
+# ChangeLog for app-text/jing
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jing/ChangeLog,v 1.28 2014/08/03 07:23:12 sera Exp $
+
+  03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -jing-20030619-r3.ebuild:
+  Remove old
+
+  17 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> jing-20091111-r1.ebuild:
+  x86 stable wrt bug #433199
+
+  10 Oct 2012; Agostino Sarubbo <ago@gentoo.org> jing-20091111-r1.ebuild:
+  Stable for amd64, wrt bug #433199
+
+*jing-20091111-r1 (25 Jul 2012)
+
+  25 Jul 2012; Ralph Sennhauser <sera@gentoo.org> -jing-20091111.ebuild,
+  +jing-20091111-r1.ebuild:
+  Avoid bogous QA warning. #423103
+  Fix saxon slot for classpath.
+
+*jing-20091111 (24 May 2012)
+
+  24 May 2012; Ralph Sennhauser <sera@gentoo.org> +jing-20091111.ebuild:
+  Version bump.
+
+  06 Nov 2010; Petteri Räty <betelgeuse@gentoo.org> -files/build.xml,
+  -files/manifest.mf:
+  Remove unused files from FILESDIR. Fixes bug #344419.
+
+  02 Jul 2007; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+  Remove emacs herd from metadata.
+
+  30 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -jing-20030619-r1.ebuild:
+  Remove -r1 so that we can get saxon-bin package masked.
+
+  30 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jing-20030619-r3.ebuild:
+  Marked stable on amd64 for bug #166862.
+
+  14 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  jing-20030619-r3.ebuild:
+  stable x86; bug 166862
+
+  14 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jing-20030619-r3.ebuild:
+  Added xalan to dependencies as it was missing there.
+
+  14 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -jing-20030619-r2.ebuild:
+  Removed unused revision.
+
+*jing-20030619-r3 (20 Jan 2007)
+
+  20 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> +files/build-r1.xml,
+  +jing-20030619-r3.ebuild:
+  Fixed bug #122038, made this compile with jdks >=1.5, cleaned the ebuild and
+  added the source use flag.
+
+*jing-20030619-r2 (03 Dec 2006)
+
+  03 Dec 2006; Joshua Nichols <nichoj@gentoo.org> files/build.xml,
+  +jing-20030619-r2.ebuild:
+  Revision bump to support new Java system. No longer uses bundled source from
+  relaxng-datatype.
+
+  22 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/jing-20030619-xerces.patch, jing-20030619-r1.ebuild:
+  Added patch to fix compilation with xerces-2.7 to fix bug #119366.
+
+  12 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jing-20030619-r1.ebuild:
+  Style/Dep fixes
+
+  12 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jing-20030619-r1.ebuild:
+  stable on amd64, added ~ppc to KEYWORDS
+
+  17 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jing-20030619-r1.ebuild:
+  fixed dependency problem. fixes bug #78312.
+
+  14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jing-20030619-r1.ebuild,
+  -jing-20030619.ebuild:
+  marked -r1 stable on x86 and removed the old version which uses packed jars.
+
+  14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jing-20030619.ebuild:
+  correct java-config calls in the startup script. fixes bug #77912.
+
+*jing-20030619-r1 (14 Nov 2004)
+
+  14 Nov 2004; Thomas Matthijs <axxo@gentoo.org> +files/build-patch.diff,
+  +files/build.xml, +files/manifest.mf, +jing-20030619-r1.ebuild:
+  build from source 63240, submitted by Jan Brinkmann <lucky@the-luckyduck.de>
+
+  03 Nov 2004; Thomas Matthijs <axxo@gentoo.org> jing-20030619.ebuild:
+  depend on app-arch/unzip
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jing-20030619.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> jing-20030619.ebuild:
+  Marking stable on x86
+
+  01 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> jing-20030619.ebuild:
+  dev-java/saxon -> dev-java/saxon-bin
+
+*jing-20030619 (13 May 2004)
+
+  13 May 2004; <mkennedy@gentoo.org> +metadata.xml, +jing-20030619.ebuild:
+  Initial port.  Ebuild contributed by Matthew Kennedy <mkennedy@gentoo.org>
+
diff --git a/app-text/jing/Manifest b/app-text/jing/Manifest
new file mode 100644
index 0000000..ba0c293
--- /dev/null
+++ b/app-text/jing/Manifest
@@ -0,0 +1,7 @@
+AUX build-patch.diff 1484 BLAKE2B f87ce71f3c95b26c30b8e4e54df95075b1fb51d1ecb94c556def4df02746756c7de7ce55d4be1d44a010b470d89ac611d6eb748cf80bfd613a82ed1293be7f1f SHA512 4aa31348db21fdc70f288283332f3bf10910f0117e6da69db600965e9581e1eeb72819a88b133a302aee7be9b056016cc487715d5e682bb6f2fd76855da851f4
+AUX build-r1.xml 729 BLAKE2B 67dc19645c98d761bf865907ceb90d66f8d0660fa9a90f12bf87e699b74633da914e24e6b9f7fa734529901ff106b96ef9be9d509a6fbc88659cebd11c8cc802 SHA512 3344812a2565c54f6da25e7438df353ee65c2352b2cf5071661f7cba1abbd84828fb515c631ce129613d4907c4c8d0f7ea3d2b8400d5d90d3afb7afdb8c42233
+AUX jing-20030619-xerces.patch 1393 BLAKE2B 0981214a4afc4f0dafcfbd1b655f01f8b0cd767b0b2e0d88cacfab94e4164119690618ce3eb10aa46919a9779ccd090223ee084e5bdc6ac9a2189688736c2756 SHA512 4562edaab38b625551ab93311f5bb11aba72172a070804ac2dbbb07c347754e0073bf3e68832524d9bfde89f7d67473b6bf850b18a4398b68d704ae6093671f6
+DIST jing-20151127.tar.gz 13746814 BLAKE2B d32610adf57e7e6635c4a8ea676158882c16d388d19561a2bf7d164908ebf6b3ab13d34bfb9e65d51b8bac85279d60a80261ad5d11f6b89c668c4af329b74fec SHA512 ac0ab4df4c462b2e850fd1982abaf870e875e193c4a04976320d972b89768ef193ea394c63101fe23339632f78e2d46ac858640ed90c7516ba1472c6cd940c5e
+EBUILD jing-20151127.ebuild 2359 BLAKE2B 0a414f14171e011b5e0eb273a285d09fa66e99912cfdf50dd99410344ac282d4b0d8e8fb6212b01ed9361f212ff4054d429837ef7347bf92c204e240424a28ca SHA512 5f6ca9ca018b1bc19480a20fd82cd93f3defe7873e5c26e4b9a020ef53983727a318cb333d7984de8b1f430c7e29046fe48334d92142ea9e98df312d9f383f73
+MISC ChangeLog 3932 BLAKE2B c63fb1d79ebdc6ba746cc0e0f470fb5731ac2a676937e5f62ef8dc7120c244c0c4d0ff39bca78d5241a49383d9d940069f7c7c7c1d31c81d10b8517f16a905d7 SHA512 8faa44797eca27dba11e728dc3c63f07effd33700660c1c5824691da368a57202426b2c583ba7e4ce7dc1ca627b2989b3ccf0da874859b78fe80748ac865f642
+MISC metadata.xml 157 BLAKE2B 058de8a1959f5f98c25e1d20a0c78facc6278f060b6ec22510c4397f9ec5696b4933deb61adedf86577222829896e3b67ca3ce33d9384fd62ffc436e66e0ed58 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece
diff --git a/app-text/jing/files/build-patch.diff b/app-text/jing/files/build-patch.diff
new file mode 100644
index 0000000..f60d9af
--- /dev/null
+++ b/app-text/jing/files/build-patch.diff
@@ -0,0 +1,23 @@
+diff -uprN src.orig/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java src/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java
+--- src.orig/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java	2004-11-07 02:12:02.231733296 +0100
++++ src/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java	2004-11-07 02:11:40.888977888 +0100
+@@ -1,6 +1,6 @@
+ package com.thaiopensource.validate.schematron;
+ 
+-import com.icl.saxon.TransformerFactoryImpl;
++import net.sf.saxon.TransformerFactoryImpl;
+ 
+ import javax.xml.transform.TransformerFactory;
+ 
+diff -uprN src.orig/com/thaiopensource/validate/schematron/SchemaReaderImpl.java src/com/thaiopensource/validate/schematron/SchemaReaderImpl.java
+--- src.orig/com/thaiopensource/validate/schematron/SchemaReaderImpl.java	2004-11-07 02:12:02.230733448 +0100
++++ src/com/thaiopensource/validate/schematron/SchemaReaderImpl.java	2004-11-07 02:11:40.886978192 +0100
+@@ -85,7 +85,7 @@ class SchemaReaderImpl implements Schema
+   private void initTransformerFactory(TransformerFactory factory) {
+     String name = factory.getClass().getName();
+     try {
+-      if (name.equals("com.icl.saxon.TransformerFactoryImpl"))
++      if (name.equals("net.sf.saxon.TransformerFactoryImpl"))
+         factory.setAttribute("http://icl.com/saxon/feature/linenumbering",
+                              Boolean.TRUE);
+       else if (name.equals("org.apache.xalan.processor.TransformerFactoryImpl")) {
diff --git a/app-text/jing/files/build-r1.xml b/app-text/jing/files/build-r1.xml
new file mode 100644
index 0000000..8de4f9a
--- /dev/null
+++ b/app-text/jing/files/build-r1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<project name="jing" default="jar">
+	<!-- compiles the sources -->
+	<target name="compile">
+		<mkdir dir="build" />
+	
+		<javac srcdir="src" 
+			destdir="build"
+			source="1.4">
+			<classpath>
+				<fileset dir="bin" includes="*.jar"/>
+			</classpath>
+		</javac>
+		
+		<!-- we need the *.properties at the correct 
+		     position in the jar archive!        -->
+		<copy todir="build">
+		<fileset dir="src">
+			<include name="**/*.properties" />
+		</fileset>
+		</copy>
+		<copy todir="build/META-INF">
+			<fileset dir="src/META-INF" />
+		</copy>
+	</target>
+
+	<!-- create the jar archive -->
+	<target name="jar" depends="compile">
+		<jar jarfile="bin/jing.jar"
+			basedir="build">
+		</jar>
+	</target>
+</project>
diff --git a/app-text/jing/files/jing-20030619-xerces.patch b/app-text/jing/files/jing-20030619-xerces.patch
new file mode 100644
index 0000000..5873822
--- /dev/null
+++ b/app-text/jing/files/jing-20030619-xerces.patch
@@ -0,0 +1,33 @@
+Only in jing-20030619: META-INF
+diff -ru jing-20030619-orig/src/com/thaiopensource/relaxng/util/JingTask.java jing-20030619/src/com/thaiopensource/relaxng/util/JingTask.java
+--- jing-20030619-orig/src/com/thaiopensource/relaxng/util/JingTask.java	2003-05-30 20:54:52.000000000 -0400
++++ jing-20030619/src/com/thaiopensource/relaxng/util/JingTask.java	2006-01-22 00:14:34.000000000 -0500
+@@ -178,4 +178,11 @@
+     filesets.addElement(set);
+   }
+ 
++  public String getXMLVersion() {
++    throw new UnsupportedOperationException();
++  }
++
++  public int getCharacterOffset() {
++    throw new UnsupportedOperationException();
++  }
+ }
+diff -ru jing-20030619-orig/src/com/thaiopensource/validate/xerces/ValidatorImpl.java jing-20030619/src/com/thaiopensource/validate/xerces/ValidatorImpl.java
+--- jing-20030619-orig/src/com/thaiopensource/validate/xerces/ValidatorImpl.java	2003-06-19 13:57:22.000000000 -0400
++++ jing-20030619/src/com/thaiopensource/validate/xerces/ValidatorImpl.java	2006-01-22 00:15:10.000000000 -0500
+@@ -330,4 +330,12 @@
+       throw (RuntimeException)nested;
+     return new SAXException(nested);
+   }
++
++  public String getXMLVersion() {
++    throw new UnsupportedOperationException();
++  }
++  public int getCharacterOffset() {
++    throw new UnsupportedOperationException();
++  }
++		 
+ }
+Only in jing-20030619/src/com/thaiopensource/validate/xerces: .ValidatorImpl.java.swp
diff --git a/app-text/jing/jing-20151127.ebuild b/app-text/jing/jing-20151127.ebuild
new file mode 100644
index 0000000..46cf4dd
--- /dev/null
+++ b/app-text/jing/jing-20151127.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+COMMIT="1e74846999bbd14ce5248acbd2be9f1e624a9846"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="https://github.com/relaxng/jing-trang/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/saxon:9
+	dev-java/xalan:0
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	${COMMON_DEP}"
+
+DEPEND="
+	>=virtual/jdk-1.7
+	dev-java/javacc:0
+	dev-java/saxon:6.5
+	dev-java/testng:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}-trang-${COMMIT}"
+
+EANT_ANT_TASKS="testng"
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_PKG_BSFIX_NAME="build.xsl"
+
+java_prepare() {
+	java-pkg_clean
+	echo "<version>${PV}</version>" > version.xml || die
+
+        #DS Not sure why this symbol is not found...
+	sed -i -e '/FeatureKeys/d' \
+	    mod/schematron/src/main/com/thaiopensource/validate/schematron/OldSaxonSchemaReaderFactory.java || die
+
+	sed -i -e '/FeatureKeys/d' \
+	    mod/schematron/src/main/com/thaiopensource/validate/schematron/NewSaxonSchemaReaderFactory.java || die
+        
+
+	# for use with saxon:6.5
+	rm -v mod/schematron/src/main/com/thaiopensource/validate/schematron/OldSaxonSchemaReaderFactory.java || die
+	sed -i -e '/OldSaxonSchemaReaderFactory/d' \
+	        mod/schematron/mod.xml || die
+}
+
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# Because this crazy package uses XSLT, we need to escape this.
+	sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
+
+	EANT_EXTRA_ARGS="-Djavacc.dir=${EROOT}usr/share/javacc/lib"
+	export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
+}
+
+
+src_compile() {
+        EANT_BUILD_TARGET="modbuild" java-pkg-2_src_compile
+	EANT_GENTOO_CLASSPATH="ant-core,iso-relax,relaxng-datatype,saxon-9,xalan,xerces-2,xml-commons-resolver,iso-relax" \
+	    EANT_BUILD_TARGET="mod.jing.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_dolauncher ${PN} \
+		--main com.thaiopensource.relaxng.util.Driver
+}
diff --git a/app-text/jing/metadata.xml b/app-text/jing/metadata.xml
new file mode 100644
index 0000000..838c00a
--- /dev/null
+++ b/app-text/jing/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-libs/libsolv/Manifest b/dev-libs/libsolv/Manifest
new file mode 100644
index 0000000..c89d873
--- /dev/null
+++ b/dev-libs/libsolv/Manifest
@@ -0,0 +1,2 @@
+DIST libsolv-0.6.36.tar.gz 647054 BLAKE2B 0052602d977e54dba65398ec123bf070300753d4f7af11304b65b0aaa433b46a0d299ac7a61d777fbd2a87a532aecd4a1d1e14342bc2d53ab9e536fdbd2df188 SHA512 aa1e17130a0f57019656015d55170693a9b3868ab958f6a8ae326b8d0de11defe043eefa089481d22d8ea5469cef8753acb4bcd0b0b8dd0d028fb1e81009d781
+EBUILD libsolv-0.6.36.ebuild 2954 BLAKE2B 4d104c3163b21771f3d8085f4937b0824c22afbc8251cd8c814b0c7b87c8adb320f6e2acc6d5f004ce50efece8d349635a6af300f66b6eab03ff5fe0dcbedb59 SHA512 946e769570854afc379e07002345168e7f713e8b38e1d22d8f53225d121f7051ff3514f7da1afe38d49da8c0ea211fd67fffb73d79c76e3df789eefea29bce96
diff --git a/dev-libs/libsolv/libsolv-0.6.36.ebuild b/dev-libs/libsolv/libsolv-0.6.36.ebuild
new file mode 100644
index 0000000..87016d2
--- /dev/null
+++ b/dev-libs/libsolv/libsolv-0.6.36.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# DS: We first may need to build with USE="-ruby -python" as otherwise linking fails.
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY=( ruby25 )
+RUBY_OPTIONAL=yes
+
+inherit cmake-utils python-r1 ruby-ng perl-module multilib
+
+DESCRIPTION="Library for solving packages and reading repositories"
+HOMEPAGE="https://doc.opensuse.org/projects/libzypp/HEAD/ https://github.com/openSUSE/libsolv"
+SRC_URI="https://github.com/openSUSE/libsolv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="bzip2 lzma perl python rpm ruby tcl"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+    dev-libs/expat
+    sys-libs/zlib
+    bzip2? ( app-arch/bzip2 )
+    lzma? ( app-arch/xz-utils )
+    perl? ( dev-lang/perl:= )
+    python? ( ${PYTHON_DEPS} )
+    rpm? ( app-arch/rpm )
+    ruby? ( $(ruby_implementations_depend) )
+    tcl? ( dev-lang/tcl:0= )"
+
+DEPEND="${RDEPEND}
+    perl? ( dev-lang/swig:0 )
+    python? ( dev-lang/swig:0 )
+    ruby? ( dev-lang/swig:0 )
+    tcl? ( dev-lang/swig:0 )
+    sys-devel/gettext"
+
+# The ruby-ng eclass is stupid and breaks this for no good reason.
+S="${WORKDIR}/${P}"
+#S="${WORKDIR}/all/${P}"
+
+pkg_setup() {
+    use perl && perl_set_version
+    use ruby && ruby-ng_pkg_setup
+}
+
+src_prepare() {
+    cmake-utils_src_prepare
+
+    # The python bindings are tightly integrated w/cmake.
+    sed -i \
+        -e 's: libsolv: -lsolv:g' \
+        bindings/python/CMakeLists.txt || die
+}
+
+src_configure() {
+    local mycmakeargs=(
+        -DUSE_VENDORDIRS=1
+        -DLIB="$(get_libdir)"
+        -DENABLE_PYTHON=0
+        $(cmake-utils_use_enable bzip2 BZIP2_COMPRESSION)
+        $(cmake-utils_use_enable lzma LZMA_COMPRESSION)
+        $(cmake-utils_use_enable perl PERL)
+        $(cmake-utils_use_enable rpm RPMDB)
+        $(cmake-utils_use_enable rpm RPMMD)
+        $(cmake-utils_use_enable ruby RUBY)
+        $(cmake-utils_use_enable tcl TCL)
+    )
+
+    cmake-utils_src_configure
+
+    if use python ; then
+        # python_foreach_impl will create a unique BUILD_DIR for
+        # us to run inside of, so no need to manage it ourselves.
+        mycmakeargs+=(
+            # Rework the bindings for a minor configure speedup.
+            -DENABLE_PYTHON=1
+            -DENABLE_{PERL,RUBY,TCL}=0
+        )
+        # Link against the common library so the bindings don't
+        # have to rebuild it.
+        LDFLAGS="-L${BUILD_DIR}/src ${LDFLAGS}" \
+        python_foreach_impl cmake-utils_src_configure
+    fi
+}
+
+pysolv_phase_func() {
+    BUILD_DIR="${BUILD_DIR}/bindings/python" \
+    cmake-utils_${EBUILD_PHASE_FUNC}
+}
+
+src_compile() {
+    cmake-utils_src_compile
+
+    use python && python_foreach_impl pysolv_phase_func
+}
+
+src_install() {
+    cmake-utils_src_install
+
+    use python && python_foreach_impl pysolv_phase_func
+    use perl && perl_delete_localpod
+}
diff --git a/dev-python/kiwi/Manifest b/dev-python/kiwi/Manifest
new file mode 100644
index 0000000..b598f12
--- /dev/null
+++ b/dev-python/kiwi/Manifest
@@ -0,0 +1,2 @@
+DIST kiwi-9.18.25.tar.gz 725488 BLAKE2B 80fb2cbf7406f112a9692957300d14e74d6069a8a23187dc80dae8090b966c4696232f9f0f51e7bd0ddf7b627ee36db0e3eefc492509813f4a6a167f4a7ebb2a SHA512 5b388462bea9a485259935cc3212263eb15a441f42012de3bbe7ecfa7cf4251d00f29bc03e33465529e11d4dcaca085e32e6a4e01ea83f6f577dc5f085ee34ad
+EBUILD kiwi-9.18.25.ebuild 397 BLAKE2B d41cda1f2184e2153dfc4cd4640dfdbda3ccbc5211f5c4324a8b40fdb4e6e467e96b10a848e0b41542c910755a5c96312f444434a79ceb0bc43cc8222e2d21a7 SHA512 c926d5edb25bf4be31340f431c80e0e2a2af69cddb4e587dca60e38d92df9d1cbd8d6b0820f23e611009ab56584b166c4ce725701b29a1c86a733ea2d0425bda
diff --git a/dev-python/kiwi/kiwi-9.18.25.ebuild b/dev-python/kiwi/kiwi-9.18.25.ebuild
new file mode 100644
index 0000000..2cab616
--- /dev/null
+++ b/dev-python/kiwi/kiwi-9.18.25.ebuild
@@ -0,0 +1,20 @@
+# automatically generated by g-sorcery
+# please do not edit this file
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Intuitive, flexible structured text to markup processor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+HOMEPAGE="http://www.ivy.fr/kiwi"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND+=" app-text/jing app-emulation/umoci"
+
diff --git a/dev-ruby/abstract_method/Manifest b/dev-ruby/abstract_method/Manifest
new file mode 100644
index 0000000..bafbdac
--- /dev/null
+++ b/dev-ruby/abstract_method/Manifest
@@ -0,0 +1,2 @@
+DIST abstract_method-1.2.1.gem 5120 BLAKE2B 2d3e401d4b0ff7ff926ab8668931379199cc424036dfff10d1031e417dcd560952823122b3ef154cff2e9243b9f722c36890db5cc3a4bd173c5e4913fc6ed9f4 SHA512 65b39bb8be13337e83204808350d1f6308b704ec0d5e2a44caaee3e73f5c62521b1827a8f89a95e848d4d28dcf3edb022c35c2219f2847d3885f43627268b966
+EBUILD abstract_method-1.2.1.ebuild 501 BLAKE2B 8ad9632c756e8471b9987fbdc196eb9041951ade2d5179322565d22ba7644d1fe2fa157c3735e318ab9289a91a6f366f5ace6ba0312a43c9df591340538e9b64 SHA512 8dcd43cc8023e0b12942feae842f94758604a0072cd8d7817c452105e576b7dc8a2560d90de10d673c4a38d63b27886678b264d70af08ea2310f511579c45510
diff --git a/dev-ruby/abstract_method/abstract_method-1.2.1.ebuild b/dev-ruby/abstract_method/abstract_method-1.2.1.ebuild
new file mode 100644
index 0000000..ab8775b
--- /dev/null
+++ b/dev-ruby/abstract_method/abstract_method-1.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract Method is a tiny library enabling you to define abstract methods in Ruby classes and modules."
+HOMEPAGE="https://rubygems.org/gems/abstract_method/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/rspec
+	dev-ruby/yard
+	dev-ruby/redcarpet
+"
diff --git a/dev-ruby/cheetah/Manifest b/dev-ruby/cheetah/Manifest
new file mode 100644
index 0000000..45e5fe0
--- /dev/null
+++ b/dev-ruby/cheetah/Manifest
@@ -0,0 +1,2 @@
+DIST cheetah-0.5.1.gem 14848 BLAKE2B 9fb5abf487f3eef010b98b1db57d6bd3e5b48e63228061cd5ad7826d6e4851aa159052dfef2f8d85a0afb20ace3ff5e8a51fa78a77fa326c0667569c58ce9e34 SHA512 c3de4ad8bce780f16e11852ca5b557b33d41e8514c8195be46c56e9e4bee84a7533c5511257c38262682e465058b13173c36f9cc7c634970052e5c61291f0468
+EBUILD cheetah-0.5.1.ebuild 526 BLAKE2B 1da3da57d65d6dbe5cd022fba708f06bdf009659da0573af0df4bd6753aef1843780570261065cfa029466d07bcfe3bcf8b1584ba18329659777425f2cfca412 SHA512 b71f330d18a71dc339df320f0172a14118d856d7f00da77b4fdc40adbc34b5a69d0d1d43fdce7a85ed27e23a776cf6ed898f8fb5d2b104dfc21242972f6b47e3
diff --git a/dev-ruby/cheetah/cheetah-0.5.1.ebuild b/dev-ruby/cheetah/cheetah-0.5.1.ebuild
new file mode 100644
index 0000000..3fd53db
--- /dev/null
+++ b/dev-ruby/cheetah/cheetah-0.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Your swiss army knife for executing external commands in Ruby safely and conveniently."
+HOMEPAGE="https://rubygems.org/gems/cheetah/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/abstract_method-1.2
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/rspec-3.3
+	>=dev-ruby/yard-0.9.11
+"
diff --git a/dev-ruby/dice/Manifest b/dev-ruby/dice/Manifest
new file mode 100644
index 0000000..acedf5f
--- /dev/null
+++ b/dev-ruby/dice/Manifest
@@ -0,0 +1 @@
+EBUILD dice-0.7.10.ebuild 957 BLAKE2B c385184b57b1ba2866e5233d28f061be6c79234dd93bb471f83ecdc65649a2cdcff9f5bdb06f7561d2a992c7b87b13016c4e686351de4d5d862205aa13be6325 SHA512 8a517cc62906f2c7903cc7aedf92610184c0502926df378e1734fd99089f93f352249d58feb984a3a8219e4a258ff7a2248be3ab727a58a9cd9b8abe4e355ef8
diff --git a/dev-ruby/dice/dice-0.7.10.ebuild b/dev-ruby/dice/dice-0.7.10.ebuild
new file mode 100644
index 0000000..0cc0a03
--- /dev/null
+++ b/dev-ruby/dice/dice-0.7.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+#inherit ruby-fakegem git-r3
+#inherit cmake-utils 
+inherit eutils multilib ruby-fakegem git-r3
+
+
+DESCRIPTION="OpenSuSE Dice for KIWI images"
+HOMEPAGE="https://github.com/OSInside/dice"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/OSInside/dice.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/all"
+EGIT_BRANCH="master"
+
+QA_PREBUILT="usr/lib*/ruby/gems/*/gems/${P}/lib/semaphore/sempahore.so"
+
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/gli
+	dev-libs/libsolv[ruby,rpm]
+"
+
+ruby_add_bdepend "
+	dev-ruby/abstract_method
+	dev-ruby/bundler
+	dev-ruby/inifile
+	dev-ruby/json
+        dev-ruby/cheetah
+        dev-ruby/rice
+"
+
+
+each_ruby_configure() {
+    ${RUBY} -rrubygems -Clib/semaphore extconf.rb || die
+}
+
+each_ruby_compile() {
+    emake -Clib/semaphore V=1
+    rm -f lib/semaphore/*.o
+}
+
diff --git a/dev-ruby/gli/Manifest b/dev-ruby/gli/Manifest
new file mode 100644
index 0000000..62e49f1
--- /dev/null
+++ b/dev-ruby/gli/Manifest
@@ -0,0 +1,2 @@
+DIST gli-2.19.0.gem 78848 BLAKE2B efeba0d702f4e0eb948321fa4866b99e0f8ba9b2f8cd01880c5ec182e1a8a6093c93ebbf383c6c76ec1af088a8ffa1483918b51a7ef5452686957aa77706f5cb SHA512 9b99f9ee55790b15511142fe9daba32be233bee146aa7d99fcc248b4baaaad06666560d7097ddfaa4e1955f2a0f2c9847529d77ff9104518e7ab7466605e85da
+EBUILD gli-2.19.0.ebuild 828 BLAKE2B 2697eb441e9409a89f9620b54fac08f09d5a3cd1974a7e342fc9f489cfe8e0e1e4821e8a870281b11bb70d0f2ca6b55bb438ef4c81e959686641c809cf04d497 SHA512 6b43801cb40df291d5682ca4398d0723091b2b624c49c7dc6f727e268178fe795011bfdbfcee1d50d0ffcac814524e19cd491be654b810305b242d72e129e3fc
diff --git a/dev-ruby/gli/gli-2.19.0.ebuild b/dev-ruby/gli/gli-2.19.0.ebuild
new file mode 100644
index 0000000..cf3eab3
--- /dev/null
+++ b/dev-ruby/gli/gli-2.19.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE="rake"
+RUBY_FAKEGEM_TASK_DOC="build_rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="gli.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Git-Like Interface Command Line Parser"
+HOMEPAGE="https://davetron5000.github.com/gli"
+LICENSE="Apache-2.0"
+
+KEYWORDS="x86 amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+all_ruby_prepare() {
+    sed -e '/sdoc/ s:^:#:' -i Rakefile || die
+
+    sed -e 's:tmp/fakehome:#{ENV["TMPDIR"]}/fakehome:' -i features/support/env.rb || die
+}
+
+each_ruby_test() {
+    # Unit tests depend on unpackaged clean_test.
+    ${RUBY} -S cucumber --format progress features || die
+}
diff --git a/dev-ruby/rice/Manifest b/dev-ruby/rice/Manifest
new file mode 100644
index 0000000..fb1cc61
--- /dev/null
+++ b/dev-ruby/rice/Manifest
@@ -0,0 +1,2 @@
+DIST rice-2.1.3.gem 261632 BLAKE2B 58eee6e8f74260a3c198bdb22c84f6da39cb698f9cbf224a97b80d890be19697ac631d6450f9a67587a9fa303bd8d9619914acf38583c74c8082b9def0c97d2f SHA512 9a11874210a3a3ce15f09db4f4ce03c5368f27cb07a1fb0ffec8aff9cb76a8aa84ae7f8d7dda40a6939477d8cc3ea254e64470d78f020f1707e9afe681fdf8e4
+EBUILD rice-2.1.3.ebuild 816 BLAKE2B 71b6d83b7745ce7c800e6ae3c8317433cf6220e4b8cab6ce44b5ca73cdf8d7d92510aab57cbd885bfc253bb24742dbfc7d8e96ca329314454b5f8cee321dbf12 SHA512 081bff09097f6509827d039890aad1ec77519b32b2034f37c3b88a535730c0ad5ea7e74188afc4088978ec34cef536d2c3305224da1a4943514fa42c1e1f0be5
diff --git a/dev-ruby/rice/rice-2.1.3.ebuild b/dev-ruby/rice/rice-2.1.3.ebuild
new file mode 100644
index 0000000..4f8d94c
--- /dev/null
+++ b/dev-ruby/rice/rice-2.1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-fakegem
+RUBY_FAKEGEM_EXTRAINSTALL="ruby"
+
+DESCRIPTION="Rice is a C++ interface to Ruby's C API. It provides a type-safe and exception-safe interface in order to make embedding Ruby and writing Ruby extensions with C++ easier. It is similar to Boost.Python in many ways, but also attempts to provide an object-oriented interface to all of the Ruby C API."
+HOMEPAGE="https://rubygems.org/gems/rice/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+
+each_ruby_prepare() {
+    ${RUBY} extconf.rb || die
+}
+
+each_ruby_compile() {
+    emake || die
+    find . -name *.o -delete
+}
+
+each_ruby_install() {
+    emake install || die    
+    each_fakegem_install
+}
diff --git a/www-apps/loggerhead/Manifest b/www-apps/loggerhead/Manifest
index f5a0796..abf4d3f 100644
--- a/www-apps/loggerhead/Manifest
+++ b/www-apps/loggerhead/Manifest
@@ -1,4 +1,4 @@
 AUX loggerhead.confd 70 BLAKE2B 9ad36fe68d6caabcdac1701fbaf5109a0b0a8f4b91110e55346642e3c399bfe6ac0b53046d12f0b8764becab19d878a00a3aaa3e9dfc7892bcf8361b23efbd20 SHA512 22a3d6558f7096174f8ab457176e49c3fbe53ea194e2e7f2ef21dcd025fbab2da9f28a0ee1ee1670acdbb44bbd34ff632b8d3df5d68de1259da90b14496a736d
 AUX loggerhead.init 556 BLAKE2B ed56b385df8be33f268dda92eae3c55d6259dda8c20a1bc44f7e330173b8062318e364507eba585104fcf24194176e1ed803f6a8a126aa78a30b22be485c7034 SHA512 a5f7307c58773201427c343f286d4e825e3f3815097f0d9840dfed1493b910930b57bd125c4c9d3cfba6f126d979eaac30b29460b7748801362272b3618e2b5a
 DIST loggerhead-1.18.1.tar.gz 695475 BLAKE2B d423de99558647363129adf7736a652e1f5f4796033f4bad90e9d28a426a2d29f8cf979f3c337ed49246fd94d2c58a66f2d261cb9e3730a2676a04551e170f0a SHA512 d265b3470bd744266ae8ee4c90a749b875b528f88924bae28f03417cbe460b82ea8649b00371b50dad679be386d56063f02a78b0f73466edb04aa75612df79e4
-EBUILD loggerhead-1.18.1.ebuild 836 BLAKE2B 1c7cafbd86358f00a284fae180509f80e22a5d92fdabfb633d3a538751fe09068b97ad670f76ba1dc7ab137acae9cb9eb8071eda9cbb27f1a606f20799da552d SHA512 dde59180184d10f047e54b36a1401f4fd62a4f3383c04f6a936da2085cc3281173b554ce9750f6d2a25e67820143ac85ba5b316f61737212b0cbe7c271e32e9a
+EBUILD loggerhead-1.18.1.ebuild 839 BLAKE2B 6c0c823198b196789db5f47bd5cde3d7b6f3bf1e44f47a2bc7210da6e41e43d17173da5a66e8b156cfa0b9db96e42e03050f7661873a754491656c9b8fdd3010 SHA512 0dee0ed69b585bf8e67a2cd896306281dcb605f22424390325a7ff841108ddc4837dbd5bc76ea64114c176500e9d5cc6106d321fb005212b80142694377c9b82
diff --git a/www-apps/loggerhead/loggerhead-1.18.1.ebuild b/www-apps/loggerhead/loggerhead-1.18.1.ebuild
index 33c34a3..775546b 100644
--- a/www-apps/loggerhead/loggerhead-1.18.1.ebuild
+++ b/www-apps/loggerhead/loggerhead-1.18.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}"/${P}
 
 src_install() {
-	distutils_src_install
+	distutils-r1_src_install
 	newinitd "${FILESDIR}"/loggerhead.init loggerhead
 	newconfd "${FILESDIR}"/loggerhead.confd loggerhead
 }
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 3af5e7a..971235b 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -15,4 +15,4 @@ AUX nvidia.udev-rule 462 BLAKE2B d417e0e4f5a64c5cee235f4640554ff1ba4d34590a6c345
 DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
 DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
-EBUILD nvidia-drivers-435.21.ebuild 15872 BLAKE2B babf1f0bb26054c93910b9a006a6d0d2d80a5ebed3dc8a987931a020a91ac2337772257f55e1312e73dde1bba972914d450d78331fb4596a452d16cfed2d78a0 SHA512 a14f8ae1c021ed9b8564f8768b046a11a42c24fd7aa152126d30baa6e4603c6fffbf2813ab5c21e76df8dcef255b736165b74748e461bfa6cc89ab9ced4b7997
+EBUILD nvidia-drivers-435.21.ebuild 15990 BLAKE2B 2e4c11013733abd0b8b71e397d8a8ee8e6120b5e061a35f3de3c654bbf1a95c88237ae005e46f2d2274a7f374083c921294a4bc8d72c4500be1d417b22a36804 SHA512 94c007130e3fa75676cd2fddc67688122c9963365f68896fec944d7e0a30f655a1a3384434a3baf0a41b603effb41a76e5601ca717e0789436d7a2602e5ee0e4
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
index a2e7f01..ab42e4a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
@@ -202,6 +202,10 @@ src_prepare() {
 
 src_compile() {
 	cd "${NV_SRC}"
+#SDS
+        grep -rl MODULE_LICENSE . | xargs -n1 sed -i'' 's/MODULE_LICENSE\([^)]\+\)/MODULE_LICENSE("GPL"/g'
+#EDS
+
 	if use kernel_FreeBSD; then
 		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
 			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die