Add new pacakges

2022-02-23 19:17:30 +01:00 · 2022-02-23 19:17:30 +01:00 · de2b917a03
commit de2b917a03
parent 123ebbf1df
175 changed files with 1143 additions and 10915 deletions
--- a/app-emulation/opencbm/Manifest
+++ b/app-emulation/opencbm/Manifest
@ -1,24 +1,8 @@
-AUX 0.4.3_rc2/0001-Adjusted-autoconf.h-location-for-Linux-2.6.33.patch 1105 BLAKE2B 84707412bff340b4613072f5c5b77cb5e76b2df5f2f589ba7a877b7e428092daa53f4bcc52a9aead6409a84e2787d6481b42760bd489f6d183345d3d8e96954c SHA512 5248d7b01c3b32b668d06cf845481119dedeb3db4de2b805ec4156beaf10cb90bd3117ee9b90142cdc5c8f17b340182505aaefb468b5fe2d8ff77f4c878b3ae7
-AUX 0.4.3_rc2/0002-Skip-various-targets-that-do-not-apply-to-this-Debia.patch 1120 BLAKE2B 7c6291dfe1fcadd45c7e7e32042e9f6fef9ffebd50d6980757beb3c62493a54ca2d612d1ae5ac9e578c06a059bbe586e7820c27a0e26f0db83a75703fd7de078 SHA512 04906c9c7c797d5e0742530141645b4c0c20188eb559e19463f675b45ed8c14d2f8332d7e9e74ae946febb50ed2b7f135c8a01bda4728a2e0db4d885550f676d
-AUX 0.4.3_rc2/0003-Allow-invoking-the-module-Makefile-from-the-kernel-t.patch 1487 BLAKE2B bd292b4c7413af7d993edba5b6c953f00aa7e9ea80f568299749f3d83fae1ec71d14f3d2df29ddcb86a1ed1f22f8e9f27e2dffe9b075a93325357822cecd57f8 SHA512 345acfea3179faad73a9584c370b38a919b72445eaa93413793aba153109b7cea9c2f2a70ad4c89708f973281f9a2f31ef4b80a536ac0e1f115fce4ba5cc2856
-AUX 0.4.3_rc2/0004-Flatten-the-module-source-tree.patch 1177 BLAKE2B a995d700b70c8d4e29f74d1491507f861c12e3053fb5b95a42e166daf8c6801cca6bcf2bae413829ad1714ed89f617bf1c9bf683d6e1df415e14fa053e50fcb2 SHA512 50b660a1b80389fc34574ac98592c5656fe611bd672e62597a476ec8214dbeae5b5df5e5edd174b83471fc7e086eb3480b9815d63dfd2796fbdfde4ca3b9e455
-AUX 0.4.3_rc2/0005-Rename-irq_count-to-cbm_irq_count-in-Linux-kernel-mo.patch 2756 BLAKE2B a3bae85e78a130095da4762b9d40c9cd218e408f39ddcb28f2eb280b6143d4590d916ac9ea0e0ddd19abad9684fd28639d8b65b6606b13ec7604e96286030848 SHA512 d4f61e72e859b7fd8431a84b1aa626e9a71b06e193b5b9105d2a00efad2003ddc680e6cbdb565103146320e00c0111b644d0526b5be11c4c13fafd967a428a65
-AUX 0.4.3_rc2/0006-Explicitly-run-sbin-ldconfig-as-sbin-may-not-be-in-P.patch 808 BLAKE2B 6f2ff715878f0ef71d5513a62d52b645c751d1a089c7faabee6ca567e26895f33caa1dba8ba789421729891c8ffdb85fbec6f6b47d801d41c2a4ad33c1ace915 SHA512 b0c41cea049a1f519f17569e05af031f41d916bae7cf6a781b6526e9acdbf17448f6739212081b74a2ac03e50374b55aea662900610b16c9fe9845ae524bdf76
-AUX 0.4.3_rc2/0007-Linux-module-Use-zu-when-printing-size_t-variables.patch 1899 BLAKE2B 9e73b9bd536acac2739aee4bcfd811fc2d4d71fcd9ab37fdfdaaa8c41cd8e60f9820d9a0ad90afd509602abad37dd6cb8cf66aea3044a61002663c9e27751d24 SHA512 d48a41475d54ee2f2c3847e3847a9c02a3e2ede33fb73f1cc656b414f36e63ccc090672f6bb023fc64a7a611a0fbc2eb924d43788cb4a4e2eeaf686da7657275
-AUX 0.4.3_rc2/0008-Linux-module-Use-.unlocked_ioctl-instead-of-.ioctl.patch 1443 BLAKE2B 434974ee61a7cb5b2024e4e2af3c8ee0bd8b3a5189124a346c65209e031e7eec44a589cddbd9cbe48ca3f2982949c7545c6719005700d8d21538e26a2d5ffbee SHA512 b300b24736bc1ff8e0dc7d0727f7bfc8a90ae14dac984fac7424c27a39f35ff7b83c17f7b89ec8795ea6803f9ef818035a2f047b7e895e838e28439f1102f528
-AUX 0.4.3_rc2/0009-Use-DEFINE_SPINLOCK-instead-of-SPIN_LOCK_UNLOCKED.patch 1000 BLAKE2B 6e07f28359501f55f5fe406df548167bcfd46952de989d3c596483380d8267c0dae99c9e2ce24af651299b7bb6947f06c1e29cb2529830dc3a88edbb5c5ac9ee SHA512 13abfc6e0f0cb8029fead1ddef977d41b2ba0e2b35e8b94611cbf1a89f8605aa7b04ddf0a02b82f635e1d3e2ebac3fb82616cb72e8877e0cb930acb43f4a8b9c
-AUX 0.4.99.94/001_opencbm-0.4.99.94-compat_destdir-1.patch 744 BLAKE2B cd409a444aac4fdbf21a4bd4aad42825caa1ae545df592a703735aed57f804b09de267872d4c3706ecce1baffe2772ec6df91033e32227ca47aa31f5316d71f2 SHA512 be2c377060d68f1123b07cfca9f7e174243c8e42e210745b890a50380d335665dab7d43e37cd06b665107d0b018a7a7f98c5443476eef681e5c9fdb7e69a5c30
-AUX 0.4.99.94/002_opencbm-0.4.99.94-udev-rules-1.patch 1419 BLAKE2B f6f53b326f4f33d404674a6cbaf324449de24b8e1950878cfd2a61fa7e512e7e1010a84a4cd6e0e467de1c917037ecb0632b910d94fca27a642bcc6674468d2e SHA512 93a1941ef26582924a61f1518e69175210fd41eaa2dcafbafa6cdbdec4c71903a6cb56aa55edfeefd30184358fa9968ee312cd881028a1d92505ab9478a1d266
-AUX 0.4.99.98/001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
-AUX 0.4.99.98/002_opencbm_usb_USB_LE16_TO_CPU_le16toh.patch 1090 BLAKE2B 48eee87ebf1a721dd0c6fff9cb74b713d91156e59da77eeb6039be97d87c405b849ddb64ad92cce776c88ff4d2e73bad5c4477ad35f607b3673d348ebcb6365a SHA512 ee1a6ac1ad8285cfcd4da65569f1a08134c127e2deccb020f08d461dd1e544c4271313ee38d844aec0118273f32935c22a810e4db3273bd3817f5075839959a6
-AUX 0.4.99.99a/001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
-AUX 0.4.99.99a/002_opencbm-0.4.99.99a-cbm_module.patch 2194 BLAKE2B 047788312b4bc7e4e418da8df0a4b4ee77953b4b8f5f3fafb455046dcdec11e366c6f48a4ccc4389bdee090da05fb9f8d671d54cab8f9c6a0c1d70266ccac3ce SHA512 36e8033aeeb5885988dd3dcc9cf943888872aed2edf1a94dd578e35c3a9f48a1e0be5d08a4b7114d472b92619862c75a13476e8a7948a349ce1ee1fd052f9fa4
-AUX 9999/001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
+AUX 001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
 AUX Makefile 1003 BLAKE2B 9e6363f8fb20826f380bae087f461b0f87a2f118be223ca809c84dba7154c6493b8937d7a46437a1773afaf5ba58179d33f9599b0fc063ae53bd5f9984128fa5 SHA512 a15c0d5a962d183f6753844aad38ef111ba4c34a4a3c8f947142b7cb5f71868ed77e965317c5aed10b9e3b5a8cb978fdffd505dbc11a6868615e5f11b19b7bd1
-DIST opencbm-0.4.99.99a-source.tar.gz 8663325 BLAKE2B 4f338abfd198e4ac9d7de54b01744d2f141492471ee388e322ec2073534171b09f7c08fd2d0c92d852cad146f5318935e46c640555f374d09a63daae2c7621be SHA512 50fb24997b75f1d1218a29d16805943403af571685774a054a5540e63d6114093e86de5046000192eac196b0e7f171e2bc21302ca2f30e4d8b396e92273ca21b
-DIST opencbm_0.4.3~rc2.orig.tar.gz 678232 BLAKE2B 4a3799cd85fdedceed1c4edddc37e6b1671f8a512934abd22f17652891f8be001a73e35e2ca41dd18061ba9ced5a4e152c31c9cc5d983e9f783c0eb47a8376c5 SHA512 5743d83a120a6f806e90a514317b0ac63eb0d9f3772252b8931e23fcfc86df5e66dd4f0f0277a875a2b7249d9bc927a0e631915dbc5c294bcc2cca58b74961dc
-EBUILD opencbm-0.4.3_rc2-r1.ebuild 1990 BLAKE2B 6d0bd722d117e1be525f2e83685d56e2a7b709faff2f143acd18b1c80b9d3e439bb4d35739e3fe35298c8e4440da3c5e04aecdc0f6bd0ed42b7d375bd825007b SHA512 e7935ee558cec948b44f4aa8c505b7a3e7e5f84187a66a77fc511439bbdf248dbc6a864d17c30ae316036d6bf6955c96fc0d9655db4a5a1861bef560af6c74e3
-EBUILD opencbm-0.4.99.99a.ebuild 3142 BLAKE2B 299fb8505ba367afbf8891b719ee81eed17009cfcaab3483e10ecea8fcf3ae9c4b084bd282201432b08d53e4d1c87934a9e10a1b206d1c7724980692c1a4b60d SHA512 d9765a37d0742c785d4a5bcde707b09cd3e6dd214e40743938309849725d32b261de4a3fac6dd0dd4c23b9580d99ab2d17cdf9c308281979f7a4af7039a22e85
-EBUILD opencbm-9999.ebuild 3342 BLAKE2B 9e5777700ec72078e4149c861ce0d35096606250cad8e6ca1b61e0994848cedca75ec023871c8e01985eaf3c3ac1e494cab36ec38c58a0148eb11579d40be8a1 SHA512 489ce10d47d392ed7ad630898d38288652ba2d7ef7afe09f67b6a20e3cabc14626d1e99f9133c7c0e368b57fbde1d8440d32dd0ff5c68e016168e763d1c89742
+DIST nibtools-0.4.99.104-source.tar.gz 118200 BLAKE2B c0232c3e591fcc34979cf11663ec4e466d765cd423ef8e56a981c1fc6454c5c2315541961258840341d45a7639e0baad1877bd76e0b2bd9f8885bba72ee8cc87 SHA512 3936c5e68251f7f11a8d912374265ff150887efdf97eb86520413616b14ad689ef0eaa6f8f0b4b66b20e9e5b2733651784a263aafe2522093a39035ac35ec4da
+DIST opencbm-0.4.99.104-source.tar.gz 13417312 BLAKE2B 1ba6e88c8765a161d6cb7a1c313c2db6cc885c616ac110c0833f59c93e2b2081e67ce730a7ead123a59b83133ddc2edf448de694c72ca582c3a155a463175027 SHA512 1c5c09ed2fd37a6db152eb9739739edee8b2200a4e02b219e982337eeb935cdac1125f59f235b5c3d1203bcd0701c2e9e35da9de921797f1617014f723de0faa
+EBUILD opencbm-0.4.99.104.ebuild 3528 BLAKE2B 5020774685cb58ccd1bb15799c08922c2e4526b7a2aea6403c54f7436c06cf9f7494f38d094659cef81b5e11e12d67edf8caf123d7b3a98b07da4088f228aeae SHA512 7dcb2938a8532ca6fac35836e93c806a32c55ec857723cea870fe72b4d180273e29ceef485fc53d2227f84deecbfece5279170a96a5bfb12560c3a02bafa1af0
+EBUILD opencbm-9999.ebuild 3257 BLAKE2B 09c6923d0dc3a8992a0892f5fd371bd88ce2db3d8b8f53109e5f3e0fc8c610591005b5c6c02434b5e526feece95ef81faeb1cf78b65df1a2d1231a37057294cb SHA512 4e0169e145c136ff9145698fe337166b513a3b148903b6c560308748a1122f991ba3bb13057f4248ef9a3b62889a4883fbc1178bc1bee1cbbe13d79470872038
 MISC ChangeLog 1019 BLAKE2B e98a63469dbe6af89e78a82020cc3f32ff90a6f9818592e11c5366bbf37c2f0d07cb72de876427e660261677a5acf8dcedc16491abf7770ce6210f0ce6c88121 SHA512 17c59cb8dd37b874de4f354f02c6d84582471475d7451a43cf9cc8982102e3a6a94aeae73799ac1e549343ee9dbac200799b3fee5edb3bd20927c6649de9b696
 MISC metadata.xml 226 BLAKE2B 168ec0c12fabd78e9c8fb3f5ebb90a3bb0f86ce0d3efd90cf476a500c63bf0d2f9968d131c7a47458518dfb4e67c1a934616cf04bebc9de56f5aea93ea2d5618 SHA512 5912920d8f6e9ee5126fb0aaa5717a562feb009cc59b759c6a6eaa909900b19e95e51e3aa7f32fdf2e77073b19878830b97947148e3adeff3b49e7555cfe29e9
--- a/app-emulation/opencbm/files/0.4.3_rc2/0001-Adjusted-autoconf.h-location-for-Linux-2.6.33.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0001-Adjusted-autoconf.h-location-for-Linux-2.6.33.patch
@ -1,39 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Adjusted autoconf.h location for Linux 2.6.33
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Linux 2.6.33 has moved linux/autoconf.h to generated/autoconf.h.
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
-Forwarded: yes
---
- sys/linux/cbm_module.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
-index d8c5a23..91ea8f3 100644
--- a/sys/linux/cbm_module.c
-+++ b/sys/linux/cbm_module.c
-@@ -22,12 +22,15 @@ static char *rcsid =
-     "@(#) $Id: cbm_module.c,v 1.13.2.21 2009/12/13 20:40:32 strik Exp $";
- #endif
- 
-+#include <linux/version.h>
-+
- #ifdef KERNEL_INCLUDE_OLD_CONFIG_H
-  #include <linux/config.h>
-#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-  #include <linux/autoconf.h>
-+#else
-+ #include <generated/autoconf.h>
- #endif
-#include <linux/version.h>
- 
- #ifdef CONFIG_MODVERSIONS
- # if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0002-Skip-various-targets-that-do-not-apply-to-this-Debia.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0002-Skip-various-targets-that-do-not-apply-to-this-Debia.patch
@ -1,37 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Skip various targets that do not apply to this Debian package
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch removes the following Makefile targets:
-
-  * sys/linux: Linux kernel module, packaged separately
-  * compat: Old cbm4linux kernel module, obsolete
-  * demo/*: Demo applications, included as examples in libopencbm-dev
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
-Forwarded: not-needed
---
- LINUX/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/LINUX/Makefile b/LINUX/Makefile
-index eb4b9f2..6a82370 100644
--- a/LINUX/Makefile
-+++ b/LINUX/Makefile
-@@ -6,9 +6,9 @@ CBMDEV   = /dev/cbm
- CBMPERM  = 666
- DEVMAJOR = 10
- DEVMINOR = 177
-SUBDIRS  = sys/linux include arch/$(ARCH) lib compat \
-+SUBDIRS  = include arch/$(ARCH) lib \
-            cbmctrl cbmformat cbmforng d64copy cbmcopy \
-           demo/flash demo/morse demo/rpm1541 docs
-+           docs
- 
- SUBDIRS_OPTIONAL = mnib36
- 
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0003-Allow-invoking-the-module-Makefile-from-the-kernel-t.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0003-Allow-invoking-the-module-Makefile-from-the-kernel-t.patch
@ -1,47 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Allow invoking the module Makefile from the kernel tree
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This makes it possible to invoke the (renamed) module Makefile directly from
-the Linux kernel source tree, without the need to set $(here) or create a
-symlink.  In particular, it should make DKMS support a little bit easier.
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
---
- sys/linux/LINUX/Makefile |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/sys/linux/LINUX/Makefile b/sys/linux/LINUX/Makefile
-index cb14aab..19a49a2 100644
--- a/sys/linux/LINUX/Makefile
-+++ b/sys/linux/LINUX/Makefile
-@@ -2,6 +2,7 @@
- 
- ifneq ($(KERNELRELEASE),)
- EXTRA_CFLAGS := $(CBM4LINUX_KERNEL_FLAGS) -I$(here)/../../include -I$(here)/../../include/LINUX
-+ccflags-y    += -I$(src)/../../include -I$(src)/../../include/LINUX
- obj-m 	     := cbm.o
- cbm-objs     := cbm_module.o
- 
-@@ -18,7 +19,6 @@ all: cbm.o
- .PHONY: all clean mrproper install uninstall install-files
- clean:
- 	rm -f cbm.mod.c *.o *.ko .cbm* Modules.symvers
-	rm -f Makefile
- 
- mrproper: clean
- 
-@@ -38,8 +38,6 @@ ifneq ($(UDEV_RULES),)
- endif
-  
- cbm.o: cbm_module.c
-	-ln -s LINUX/Makefile Makefile
- 	$(MAKE) -C $(KERNEL_SOURCE) here=`pwd` CBM4LINUX_KERNEL_FLAGS=$(KERNEL_FLAGS) SUBDIRS=`pwd` modules
-	-rm -f Makefile
- 
- endif
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0004-Flatten-the-module-source-tree.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0004-Flatten-the-module-source-tree.patch
@ -1,41 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Flatten the module source tree
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows flattening the module source tree in a simple src/ and
-include/ directory pair, getting rid of all the LINUX/ stuff.
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
-Forwarded: not-needed
---
- sys/linux/LINUX/Makefile |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/sys/linux/LINUX/Makefile b/sys/linux/LINUX/Makefile
-index 19a49a2..a4ef189 100644
--- a/sys/linux/LINUX/Makefile
-+++ b/sys/linux/LINUX/Makefile
-@@ -1,8 +1,7 @@
- # $Id: Makefile,v 1.3.4.3 2007/11/11 16:57:25 strik Exp $
- 
- ifneq ($(KERNELRELEASE),)
-EXTRA_CFLAGS := $(CBM4LINUX_KERNEL_FLAGS) -I$(here)/../../include -I$(here)/../../include/LINUX
-ccflags-y    += -I$(src)/../../include -I$(src)/../../include/LINUX
-+ccflags-y    += -I$(src)/../include
- obj-m 	     := cbm.o
- cbm-objs     := cbm_module.o
- 
-@@ -12,7 +11,7 @@ modules:
- 
- else
- 
-include ../../LINUX/config.make
-+include ../config.make
- 
- all: cbm.o
- 
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0005-Rename-irq_count-to-cbm_irq_count-in-Linux-kernel-mo.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0005-Rename-irq_count-to-cbm_irq_count-in-Linux-kernel-mo.patch
@ -1,80 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Rename irq_count to cbm_irq_count in Linux kernel module
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-arch/x86/include/asm/processor.h already defines a variable called
-irq_count for CONFIG_X86_64.
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
-Forwarded: yes
---
- sys/linux/cbm_module.c |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
-index 91ea8f3..4b50626 100644
--- a/sys/linux/cbm_module.c
-+++ b/sys/linux/cbm_module.c
-@@ -257,7 +257,7 @@ static struct wait_queue *cbm_wait_q;
- static wait_queue_head_t cbm_wait_q;
- #endif
- volatile static int eoi;
-volatile static int irq_count;
-+volatile static int cbm_irq_count;
- 
- #ifndef KERNEL_VERSION
- # define signal_pending(p) (p->signal & ~p->blocked)
-@@ -425,7 +425,7 @@ static void wait_for_listener(void)
-         add_wait_queue(&cbm_wait_q, &wait);
-         current->state = TASK_INTERRUPTIBLE;
-         RELEASE(CLK_OUT);
-        while(irq_count && !signal_pending(current)) {
-+        while(cbm_irq_count && !signal_pending(current)) {
-             schedule();
-         }
-         remove_wait_queue(&cbm_wait_q, &wait);
-@@ -537,7 +537,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
-         size_t sent = 0;
-         unsigned long flags;
- 
-        eoi = irq_count = 0;
-+        eoi = cbm_irq_count = 0;
- 
-         DPRINTK("cbm_write: %d bytes, atn=%d\n", cnt, atn);
- 
-@@ -574,7 +574,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
-                 }
-                 udelay(50);
-                 if(GET(DATA_IN)) {
-                        irq_count = ((sent == (cnt-1)) && (atn == 0)) ? 2 : 1;
-+                        cbm_irq_count = ((sent == (cnt-1)) && (atn == 0)) ? 2 : 1;
-                         wait_for_listener();
- 
-                         if(signal_pending(current)) {
-@@ -886,10 +886,10 @@ static irqreturn_t cbm_interrupt(int irq, void *dev_id)
- {
-         POLL();         /* acknowledge interrupt */
- 
-        if(irq_count == 0) {
-+        if(cbm_irq_count == 0) {
-                 return IRQ_NONE;
-         }
-        if(--irq_count == 0) {
-+        if(--cbm_irq_count == 0) {
-                 DPRINTK("continue to send (no EOI)\n");
-                 SET(CLK_OUT);
-                 wake_up_interruptible(&cbm_wait_q);
-@@ -1031,7 +1031,7 @@ int cbm_init(void)
- #endif
-                         );
- 
-        irq_count = 0;
-+        cbm_irq_count = 0;
- 
-         out_bits  = (CTRL_READ() ^ out_eor) &
-                     (DATA_OUT|CLK_OUT|ATN_OUT|RESET);
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0006-Explicitly-run-sbin-ldconfig-as-sbin-may-not-be-in-P.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0006-Explicitly-run-sbin-ldconfig-as-sbin-may-not-be-in-P.patch
@ -1,27 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Explicitly run /sbin/ldconfig, as /sbin may not be in $PATH
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
---
- lib/LINUX/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/LINUX/Makefile b/lib/LINUX/Makefile
-index f5cc303..edeae4b 100644
--- a/lib/LINUX/Makefile
-+++ b/lib/LINUX/Makefile
-@@ -37,7 +37,7 @@ install-files:
- 	cd $(LIBDIR) && ln -sf $(SHLIBV3) $(SHLIBV); ln -sf $(SHLIBV) $(SHLIB)
- 
- install: install-files
-	ldconfig -n $(LIBDIR)
-+	$(LDCONFIG) -n $(LIBDIR)
- 
- uninstall:
- 	cd $(LIBDIR) && rm -f $(LIB) $(SHLIB) $(SHLIBV) $(SHLIBV3)
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0007-Linux-module-Use-zu-when-printing-size_t-variables.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0007-Linux-module-Use-zu-when-printing-size_t-variables.patch
@ -1,55 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Linux module: Use "%zu" when printing size_t variables
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
-Forwarded: yes
---
- sys/linux/cbm_module.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
-index 4b50626..dd41b78 100644
--- a/sys/linux/cbm_module.c
-+++ b/sys/linux/cbm_module.c
-@@ -447,7 +447,7 @@ static int cbm_read(struct inode *inode, struct file *f, char *buf, int count)
-         int ok = 0;
-         unsigned long flags;
- 
-        DPRINTK("cbm_read: %d bytes\n", count);
-+        DPRINTK("cbm_read: %zu bytes\n", count);
- 
-         if(eoi) {
-                 return 0;
-@@ -523,7 +523,7 @@ static int cbm_read(struct inode *inode, struct file *f, char *buf, int count)
-                 return -EIO;
-         }
- 
-        DPRINTK("received=%d, count=%d, ok=%d, eoi=%d\n",
-+        DPRINTK("received=%zu, count=%zu, ok=%d, eoi=%d\n",
-                         received, count, ok, eoi);
- 
-         return received;
-@@ -539,7 +539,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
- 
-         eoi = cbm_irq_count = 0;
- 
-        DPRINTK("cbm_write: %d bytes, atn=%d\n", cnt, atn);
-+        DPRINTK("cbm_write: %zu bytes, atn=%d\n", cnt, atn);
- 
-         RELEASE(DATA_OUT);
-         SET(CLK_OUT | (atn ? ATN_OUT : 0));
-@@ -593,7 +593,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
-                      rv = -ENODEV;
-                 }
-         }
-        DPRINTK("%d bytes sent, rv=%d\n", sent, rv);
-+        DPRINTK("%zu bytes sent, rv=%d\n", sent, rv);
- 
-         if(talk && (rv == 0)) {
-                 local_irq_save(flags);
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0008-Linux-module-Use-.unlocked_ioctl-instead-of-.ioctl.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0008-Linux-module-Use-.unlocked_ioctl-instead-of-.ioctl.patch
@ -1,41 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 12:50:53 -0400
-Subject: Linux module: Use .unlocked_ioctl instead of .ioctl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cbm_ioctl() does not assume it is holding the BKL, so we can move it
-as-is from .ioctl to .unlocked_ioctl.
-
-Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
-
-Forwarded: yes
---
- sys/linux/cbm_module.c |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
-index dd41b78..f38e388 100644
--- a/sys/linux/cbm_module.c
-+++ b/sys/linux/cbm_module.c
-@@ -627,8 +627,7 @@ static int cbm_write(struct inode *inode, struct file *f, const char *buf, int c
-         return cbm_raw_write(buf, cnt, 0, 0);
- }
- 
-static int cbm_ioctl(struct inode *inode, struct file *f,
-                     unsigned int cmd, unsigned long arg)
-+static long cbm_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
- {
- 
-         /*linux parallel burst */
-@@ -924,7 +923,7 @@ static struct file_operations cbm_fops =
- #endif
-         .read    = cbm_read,       /* read */
-         .write   = cbm_write,      /* write */
-        .ioctl   = cbm_ioctl,      /* ioctl */
-+        .unlocked_ioctl = cbm_ioctl,      /* ioctl */
-         .open    = cbm_open,       /* open */
-         .release = cbm_release,    /* release */
- };
-- 
--- a/app-emulation/opencbm/files/0.4.3_rc2/0009-Use-DEFINE_SPINLOCK-instead-of-SPIN_LOCK_UNLOCKED.patch
+++ b/app-emulation/opencbm/files/0.4.3_rc2/0009-Use-DEFINE_SPINLOCK-instead-of-SPIN_LOCK_UNLOCKED.patch
@ -1,23 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
-Date: Fri, 20 May 2011 22:05:53 -0400
-Subject: Use DEFINE_SPINLOCK instead of SPIN_LOCK_UNLOCKED
-
-SPIN_LOCK_UNLOCKED() has been removed in 2.6.39.
---
- sys/linux/cbm_module.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
-index f38e388..6b360ef 100644
--- a/sys/linux/cbm_module.c
-+++ b/sys/linux/cbm_module.c
-@@ -77,7 +77,7 @@ static char *rcsid =
- /* Defines needed by parallel burst-routines: */
- #include <linux/spinlock.h> /* the spinlock-system, used for parallel burst */
- 
-#define IRQSTOPVARS     unsigned long flags; spinlock_t parallel_burst_lock = SPIN_LOCK_UNLOCKED;
-+#define IRQSTOPVARS     unsigned long flags; DEFINE_SPINLOCK(parallel_burst_lock);
- #define disable()       spin_lock_irqsave(&parallel_burst_lock, flags)
- #define enable()        spin_unlock_irqrestore(&parallel_burst_lock, flags)
- #define printf(x)       printk(x)
-- 
--- a/app-emulation/opencbm/files/0.4.99.94/001_opencbm-0.4.99.94-compat_destdir-1.patch
+++ b/app-emulation/opencbm/files/0.4.99.94/001_opencbm-0.4.99.94-compat_destdir-1.patch
@ -1,21 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2017-05-05
-Initial Package Version: 0.4.99.94
-Origin: me
-Upstream Status: unknown
-Description: add support for desdir install also on compat
- 
-diff -Naur opencbm-0.4.99.94.orig/opencbm/compat/LINUX/Makefile opencbm-0.4.99.94/opencbm/compat/LINUX/Makefile
--- opencbm-0.4.99.94.orig/opencbm/compat/LINUX/Makefile	2017-05-05 13:52:14.110473163 +0000
-+++ opencbm-0.4.99.94/opencbm/compat/LINUX/Makefile	2017-05-05 13:49:39.416513289 +0000
-@@ -17,8 +17,8 @@
- mrproper: clean
- 
- install-files:
-	install -m 644 $(HDRS) $(INCDIR)
-	install -m 644 $(LIBS) $(LIBDIR)
-+	install -m 644 $(HDRS) $(DESTDIR)$(INCDIR)
-+	install -m 644 $(LIBS) $(DESTDIR)$(LIBDIR)
- 
- install: install-files
- 
--- a/app-emulation/opencbm/files/0.4.99.94/002_opencbm-0.4.99.94-udev-rules-1.patch
+++ b/app-emulation/opencbm/files/0.4.99.94/002_opencbm-0.4.99.94-udev-rules-1.patch
@ -1,30 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2017-05-05
-Initial Package Version: 0.4.99.94
-Origin: me
-Upstream Status: committed
-Description: update rules files for consistency
- 
-diff -Naur opencbm-0.4.99.94.orig/xu1541/udev/45-opencbm.rules opencbm-0.4.99.94/xu1541/udev/45-opencbm.rules
--- opencbm-0.4.99.94.orig/xu1541/udev/45-opencbm.rules	2017-05-05 15:27:35.123976085 +0000
-+++ opencbm-0.4.99.94/xu1541/udev/45-opencbm.rules	2017-05-05 08:52:45.430454453 +0000
-@@ -1,6 +1,6 @@
- SUBSYSTEM!="usb_device", ACTION!="add", GOTO="opencbm_rules_end"
- 
- # xu1541
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="c632", GROUP="plugdev", MODE="0664"
-+SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="c632", GROUP="users", MODE="0664"
- 
- LABEL="opencbm_rules_end"
-diff -Naur opencbm-0.4.99.94.orig/xum1541/udev/45-opencbm-usb.rules opencbm-0.4.99.94/xum1541/udev/45-opencbm-usb.rules
--- opencbm-0.4.99.94.orig/xum1541/udev/45-opencbm-usb.rules	2017-05-05 15:27:35.132976374 +0000
-+++ opencbm-0.4.99.94/xum1541/udev/45-opencbm-usb.rules	2017-05-05 08:52:45.450455086 +0000
-@@ -1,7 +1,6 @@
- SUBSYSTEM!="usb_device", ACTION!="add", GOTO="opencbm_rules_end"
- 
- # xum1541
-SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0504",
-MODE="0664", GROUP="cdrom"
-+SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0504", MODE="0664", GROUP="users"
- 
- LABEL="opencbm_rules_end"
--- a/app-emulation/opencbm/files/0.4.99.98/002_opencbm_usb_USB_LE16_TO_CPU_le16toh.patch
+++ b/app-emulation/opencbm/files/0.4.99.98/002_opencbm_usb_USB_LE16_TO_CPU_le16toh.patch
@ -1,29 +0,0 @@
-commit 84b10fc7188de11fade4df963503080acbdb198c (HEAD -> refs/heads/usb_USB_LE16_TO_CPU_le16toh)
-Author:     Uffe Jakobsen <microtop@starion.dk>
-AuthorDate: Sun Oct 16 17:02:22 2016 +0200
-Commit:     Uffe Jakobsen <microtop@starion.dk>
-CommitDate: Sun Oct 16 17:02:51 2016 +0200
-
-    Linux: newer usb.h does not have USB_LE16_TO_CPU() macro anymore
---
-:100644 100644 b9f6bd1... d7681cf... M	xu1541/misc/usb_echo_test.c
- xu1541/misc/usb_echo_test.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git xu1541/misc/usb_echo_test.c xu1541/misc/usb_echo_test.c
-index b9f6bd1..d7681cf 100644
--- xu1541/misc/usb_echo_test.c
-+++ xu1541/misc/usb_echo_test.c
-@@ -27,6 +27,12 @@ usb_dev_handle      *handle = NULL;
- #define QUIT_KEY
- #endif
- 
-+// Linux: newer usb.h does not have USB_LE16_TO_CPU() macro anymore
-+#ifndef USB_LE16_TO_CPU
-+#include <endian.h>
-+#define USB_LE16_TO_CPU(x) x=le16toh(x);
-+#endif
-+
- /* send a number of 16 bit words to the xu1541 interface */
- /* and verify that they are correctly returned by the echo */
- /* command. This may be used to check the reliability of */
--- a/app-emulation/opencbm/files/0.4.99.99a/001_opencbm-0.4.99.98-ncurses6-1.patch
+++ b/app-emulation/opencbm/files/0.4.99.99a/001_opencbm-0.4.99.98-ncurses6-1.patch
@ -1,19 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2017-05-14
-Initial Package Version: 0.4.99.98
-Origin: me
-Upstream Status: unknown
-Description: ncurses 6.x has split ncursses/tinfo libs
-
- 
-diff -Naur opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile
--- opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile	2017-05-14 06:19:02.585302812 +0000
-+++ opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile	2017-05-14 06:20:09.604409904 +0000
-@@ -3,6 +3,6 @@
- 
- PROG = cbmlinetester
- CFLAGS += -DHAVE_NCURSES
-LINK_FLAGS += -lncurses
-+LINK_FLAGS += -lncurses -ltinfo
- 
- include ${RELATIVEPATH}LINUX/prgrules.make
--- a/app-emulation/opencbm/files/0.4.99.99a/002_opencbm-0.4.99.99a-cbm_module.patch
+++ b/app-emulation/opencbm/files/0.4.99.99a/002_opencbm-0.4.99.99a-cbm_module.patch
@ -1,58 +0,0 @@
-From 32a19cb166f6913dcf9885284bf36082f39b350a Mon Sep 17 00:00:00 2001
-From: Spiro Trikaliotis <spiro.trikaliotis@gmx.de>
-Date: Sat, 12 Oct 2019 20:37:30 +0200
-Subject: [PATCH] Fix compiler error on kernel module compilation
-
-Before, we tried to determine with HAVE_LINUX_SCHED_SIGNAL_H if we need
-to include <linux/sched/signal.h>. Unfortunately, the mechanism was not
-robust.
-
-So, reworked it and hardcoded it depending on the kernel version (>=
-4.11.0). This fixes #22.
---
- opencbm/LINUX/config.make      | 3 +--
- opencbm/sys/linux/cbm_module.c | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/opencbm/LINUX/config.make b/opencbm/LINUX/config.make
-index 7e05f33b..30d42d2c 100644
--- a/opencbm/LINUX/config.make
-+++ b/opencbm/LINUX/config.make
-@@ -107,7 +107,6 @@ KERNEL_SOURCE = ${shell for d in /lib/modules/`uname -r`/build /usr/src/linux; d
- ifneq ($(strip $(KERNEL_SOURCE)),)
-   HAVE_KERNEL_SOURCE=-DHAVE_KERNEL_SOURCE=1
-   KERNEL_INCLUDE_CONFIG = ${shell for c in ${KERNEL_SOURCE}/include/linux/autoconf.h ${KERNEL_SOURCE}/include/linux/config.h; do test -f $$c && echo $$c; done | head -n 1}
-  KERNEL_HAVE_LINUX_SCHED_SIGNAL_H = ${shell test -e ${KERNEL_SOURCE}/include/linux/sched/signal.h && echo -DHAVE_LINUX_SCHED_SIGNAL_H=1}
- endif
- 
- HAVE_LIBUSB0 = ${shell pkg-config libusb && echo 1} 
-@@ -137,7 +136,7 @@ endif
- #   XE1541-like cable. Don't to it. Upgrade to XM1541 instead.
- #
- #KERNEL_FLAGS = -DDIRECT_PORT_ACCESS
-KERNEL_FLAGS = "${KERNEL_DEFINE} ${KERNEL_HAVE_LINUX_SCHED_SIGNAL_H}"
-+KERNEL_FLAGS = "${KERNEL_DEFINE}"
- endif
- 
- #
-diff --git a/opencbm/sys/linux/cbm_module.c b/opencbm/sys/linux/cbm_module.c
-index 94456015..dba88511 100644
--- a/opencbm/sys/linux/cbm_module.c
-+++ b/opencbm/sys/linux/cbm_module.c
-@@ -32,7 +32,6 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- 
-
- /*
-  * Starting with 2.3.10, the IRQ and bi-directional bits are uncoupled from
-  * the control byte.
-@@ -54,7 +53,7 @@
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
- #include <linux/sched.h>
-#ifdef HAVE_LINUX_SCHED_SIGNAL_H
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
- #include <linux/sched/signal.h>
- #endif
- #include <linux/uaccess.h>
--- a/app-emulation/opencbm/files/0.4.99.98/001_opencbm-0.4.99.98-ncurses6-1.patch
+++ b/app-emulation/opencbm/files/0.4.99.98/001_opencbm-0.4.99.98-ncurses6-1.patch
--- a/app-emulation/opencbm/files/9999/001_opencbm-0.4.99.98-ncurses6-1.patch
+++ b/app-emulation/opencbm/files/9999/001_opencbm-0.4.99.98-ncurses6-1.patch
@ -1,19 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2017-05-14
-Initial Package Version: 0.4.99.98
-Origin: me
-Upstream Status: unknown
-Description: ncurses 6.x has split ncursses/tinfo libs
-
- 
-diff -Naur opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile
--- opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile	2017-05-14 06:19:02.585302812 +0000
-+++ opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile	2017-05-14 06:20:09.604409904 +0000
-@@ -3,6 +3,6 @@
- 
- PROG = cbmlinetester
- CFLAGS += -DHAVE_NCURSES
-LINK_FLAGS += -lncurses
-+LINK_FLAGS += -lncurses -ltinfo
- 
- include ${RELATIVEPATH}LINUX/prgrules.make
--- a/app-emulation/opencbm/opencbm-0.4.3_rc2-r1.ebuild
+++ b/app-emulation/opencbm/opencbm-0.4.3_rc2-r1.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs linux-mod versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="OpenCBM is a package to control and use serial devices as used by most Commodore (CBM) 8-bit mach"
-HOMEPAGE="http://opencbm.trikaliotis.net/"
-SRC_URI="https://www.fbriere.net/debian/pool/opencbm/o/opencbm/opencbm_${PV/_/~}.orig.tar.gz
-	http://www.fbriere.net/debian/dists/unstable/opencbm/src/opencbm_${PV/_/~}.orig.tar.gz
-	https://launchpad.net/~mdeslaur/+archive/ppa/+files/opencbm_${PV/_/~}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="virtual/linux-sources
-	dev-embedded/cc65
-	app-text/linuxdoc-tools"
-
-S="${WORKDIR}"/${PN}-${PV/_/}
-
-BUILD_PARAMS="KDIR=$KERNEL_DIR"
-MODULE_NAMES="cbm(misc:${S}/sys/linux:${S}/sys/linux)"
-BUILD_TARGETS="all"
-
-src_prepare() {
-	# convert linefeed
-	edos2unix `find . -name '*' -type f`
-	# 6502 sources ar always up to date
-	touch `find . -name '*.?65' -type f`
-	# add debian patches no demo & doc & no kernel
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" epatch
-	# sed correct path
-	sed -e 's,^PREFIX.*,PREFIX = /usr,' \
-                -e 's,/man/man1,/share/man/man1,g' \
-                -e 's,/info,/share/info,g' -i ${S}/LINUX/config.make
-	# copy module makefile that don't intefer with gentoo kernel build system
-	cp ${FILESDIR}/Makefile ${S}/sys/linux/Makefile
-}
-
-src_compile() {
-	emake -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" showvars || die "showvars fail"
-	emake -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" || die "make fail"
-	linux-mod_src_compile
-}
-
-src_install() {
-	emake -f LINUX/Makefile PREFIX="${D}/usr" install
-	linux-mod_src_install
-        generate_modulesd
-
-}
-
-pkg_postinst() {
-        linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-        linux-mod_pkg_postrm
-}
--- a/app-emulation/opencbm/opencbm-0.4.99.104.ebuild
+++ b/app-emulation/opencbm/opencbm-0.4.99.104.ebuild
@ -2,23 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $

-EAPI="5"
+EAPI="7"
+
+inherit eutils toolchain-funcs linux-mod udev
+
+if [[ ${PV} = 9999* ]]; then
+    inherit git-r3
+    EGIT_REPO_URI="https://github.com/OpenCBM/OpenCBM.git"
+else
+    #SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz"
+    #SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2"
+    SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz
+	     https://github.com/OpenCBM/nibtools/tarball/master -> nibtools-${PV}-source.tar.gz"
+fi

-inherit eutils toolchain-funcs linux-mod versionator udev

-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
 SDIR="include libmisc arch/linux lib cbmctrl cbmformat d64copy cbmcopy libtrans cbmforng d82copy demo/flash demo/morse demo/rpm1541 sample/libtrans cbmrpm41"

 DESCRIPTION="OpenCBM is a package to control and use serial devices as used by most Commodore (CBM) 8-bit mach"
 HOMEPAGE="http://opencbm.trikaliotis.net/"
-#SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz"
-#SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2"
-SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+#KEYWORDS=""
 IUSE="doc"

 DEPEND="virtual/linux-sources
@ -40,22 +47,24 @@ src_prepare() {
 	# 6502 sources ar always up to date
 	touch `find . -name '*.?65' -type f`
 	# add debian patches no demo & doc & no kernel
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" epatch
+	eapply "${FILESDIR}/001_opencbm-0.4.99.98-ncurses6-1.patch"
 	# sed correct path
 	sed -e 's,^PREFIX.*,PREFIX = /usr,' \
                -e 's,/man/man1,/share/man/man1,g' \
                -e 's,etc/udev/rules.d,lib/udev/rules.d,g' \
                -e 's,/info,/share/info,g' -i ${S}/opencbm/LINUX/config.make
 	# sed correct path
-	sed -e 's,opencbm/sys/linux/,,g' \
+	sed -e 's,xa1541 opencbm/sys/linux/,xa1541,g' \
 	    -e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i ${S}/LINUX/Makefile
 	# copy module makefile that don't intefer with gentoo kernel build system
 	cp ${FILESDIR}/Makefile ${S}/opencbm/sys/linux/Makefile
+	cp -r "${WORKDIR}"/OpenCBM-nibtools-*/* ${S}/opencbm/nibtools/
+	eapply_user
 }

 src_compile() {
-	emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" all || die "make fail"
+	emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" all || die "make fail"
+	emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" opencbm || die "make fail"
 	linux-mod_src_compile
 }

@ -63,7 +72,7 @@ src_install() {
 	dodir lib/udev/rules.d
 	dodir etc/opencbm.conf.d
 	dodir usr/lib/opencbm
-	emake -f LINUX/Makefile DESTDIR="${D}" install-all
+	emake -f LINUX/Makefile DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install-all
 	exeinto usr/lib/opencbm
 	doexe opencbm/LINUX/plugin_helper_tools
 	newexe debian/install_plugin.sh install_plugin
--- a/app-emulation/opencbm/opencbm-9999.ebuild
+++ b/app-emulation/opencbm/opencbm-9999.ebuild
@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $

-EAPI="5"
+EAPI="7"

-inherit eutils toolchain-funcs linux-mod versionator udev
+inherit eutils toolchain-funcs linux-mod udev

 if [[ ${PV} = 9999* ]]; then
    inherit git-r3
@ -16,8 +16,6 @@ else
 fi


-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
 SDIR="include libmisc arch/linux lib cbmctrl cbmformat d64copy cbmcopy libtrans cbmforng d82copy demo/flash demo/morse demo/rpm1541 sample/libtrans cbmrpm41"

 DESCRIPTION="OpenCBM is a package to control and use serial devices as used by most Commodore (CBM) 8-bit mach"
@ -25,7 +23,8 @@ HOMEPAGE="http://opencbm.trikaliotis.net/"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS=""
 IUSE="doc"

 DEPEND="virtual/linux-sources
@ -34,7 +33,7 @@ DEPEND="virtual/linux-sources
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libusb-compat"

-S="${WORKDIR}"/opencbm-${PV//./_}
+S="${WORKDIR}"/OpenCBM-${PV//./_}

 BUILD_PARAMS="KDIR=$KERNEL_DIR"
 MODULE_NAMES="cbm(misc:${S}/opencbm/sys/linux:${S}/opencbm/sys/linux)"
@ -47,8 +46,7 @@ src_prepare() {
 	# 6502 sources ar always up to date
 	touch `find . -name '*.?65' -type f`
 	# add debian patches no demo & doc & no kernel
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" epatch
+	eapply "${FILESDIR}/001_opencbm-0.4.99.98-ncurses6-1.patch"
 	# sed correct path
 	sed -e 's,^PREFIX.*,PREFIX = /usr,' \
                -e 's,/man/man1,/share/man/man1,g' \
@ -59,6 +57,7 @@ src_prepare() {
 	    -e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i ${S}/LINUX/Makefile
 	# copy module makefile that don't intefer with gentoo kernel build system
 	cp ${FILESDIR}/Makefile ${S}/opencbm/sys/linux/Makefile
+	eapply_user
 }

 src_compile() {
@ -74,8 +73,8 @@ src_install() {
 	exeinto usr/lib/opencbm
 	doexe opencbm/LINUX/plugin_helper_tools
 	newexe debian/install_plugin.sh install_plugin
-	#insinto lib/udev/rules.d
-	#newins opencbm/sys/linux/45-opencbm-xa1541.rules 45-opencbm-xa1541.rules
+	insinto lib/udev/rules.d
+	newins opencbm/sys/linux/45-opencbm-xa1541.rules 45-opencbm-xa1541.rules
 	rm -rf ${D}/var
 	linux-mod_src_install
        generate_modulesd
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@ -1,5 +1,7 @@
 AUX vice-2.3-notexi.patch 395 BLAKE2B 83bafa978b9984731c44f5da620a38452a3b4bfbf5bb1e1671eb7dc0319277b99dcfe2dc9497429cc50d9a0895b867aaf2dd39d4176afaf7e8b694b19c830a11 SHA512 3e48ab7e34653d5b16faedfb982c647e83ca4312981df68085c482369618ae36057702fead219b46c796efc396e87bbb15d24508c52b0a83488dad6babf5f0dc
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
+DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2 SHA512 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
 EBUILD vice-3.5.ebuild 4140 BLAKE2B 4bff9943a56a980b1fd49ebb114a7b46bc29a32fdbcec886a01ba51171e27bc416089a1ae13e8d84446363c7e497d456d8960c4451dbfd59ad198ec4ba0896bb SHA512 dd95fa1eb1d2c50e3440e1405554c6cc17a53551fc7f47c435de966506fd86c009bcd4b9baae304cd322ef6af526c36def2cacb297efdda178bde8dc1ce544f3
+EBUILD vice-3.6.1.ebuild 4641 BLAKE2B c75f9106b43cd990b62de500b210b7a10ff073da05077b5ff79886c828a7b6827f061ce7dc145b2eb3e172877984a9e2879a96e37a7876aae84a180ae72a2b02 SHA512 ecdc10cc82d9e27cdd1e60151c3ef68db660c4567117be8e6bfaec2ab1b050e537cd5e13446b14926985b14a27817b8381c1034f4c64bdb3a38b0d69ef919f32
 MISC ChangeLog 10317 BLAKE2B e4b09b8fcbefe03a7286cc804db2acb9c0dbf33813b200aac27d7ed63b0e7ce906195ffbb5bdff6583550799afe42bc3b620a642b5c4a7dfe0ab1c61c4c9c4a1 SHA512 01ce1918922df767f36580047a4425b875d883ca90356d76739e1b6483e32ecdaff60168fa103843ab36083ddd42e98cd19ffe62d77d92535f388def371fcf30
 MISC metadata.xml 355 BLAKE2B bcaff95114c4ce87569bb1cf5f10d978ad682b054ecc68f4a3ee5b8bcb5113b592980560fcd7e988affe55665524cdcc6c3a735d246c83811581fdab5d61b001 SHA512 d0086c4b840f65a1dd594060b7ff5be4e3e04c0eca662e709c3cded434d1987c480a77e522d629daa3d50b49975d68a242098cf03d5b661c4fe7539ed5490ac7
--- a/app-emulation/vice/vice-3.6.1.ebuild
+++ b/app-emulation/vice/vice-3.6.1.ebuild
@ -0,0 +1,194 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# --enable-static-lame triggers bug #814380 with EAPI-8, could work
+# around but staying EAPI-7 for now unless there's some urgency
+EAPI=7
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
+	lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="
+	|| ( gtk headless sdl )
+	gtk? ( zlib )"
+
+# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+RDEPEND="
+	virtual/libintl
+	app-emulation/opencbm
+	alsa? ( media-libs/alsa-lib )
+	ethernet? (
+		net-libs/libpcap
+		sys-libs/libcap
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	gif? ( media-libs/giflib:= )
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		media-libs/fontconfig:1.0
+		media-libs/glew:0=
+		sys-libs/readline:=
+		virtual/opengl
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	jpeg? ( virtual/jpeg )
+	lame? ( media-sound/lame )
+	mpg123? ( media-sound/mpg123 )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	parport? ( sys-libs/libieee1284 )
+	pci? ( sys-apps/pciutils )
+	png? ( media-libs/libpng:= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/sdl2-image
+		sys-libs/readline:=
+	)
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-arch/unzip
+	app-text/dos2unix
+	dev-embedded/xa
+	dev-lang/perl
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+	doc? ( virtual/texi2dvi )
+	gtk? ( x11-misc/xdg-utils )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# Strip the predefined C(XX)FLAGS.
+	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+
+	MULTIBUILD_VARIANTS=(
+		$(usev gtk)
+		$(usev headless)
+		$(usev sdl)
+	)
+
+	# Debug build currently broken without copy sources.
+	multibuild_copy_sources
+}
+
+src_configure() {
+	tc-export AR
+
+	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_src_configure() {
+	# Append ".variant" to x* programs if building multiple variants.
+	local xform
+	(( ${#MULTIBUILD_VARIANTS[@]} > 1 )) &&
+		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
+
+	vice-multi_enable() {
+		if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
+			echo --enable-${2}
+		else
+			echo --disable-${2}
+		fi
+	}
+
+	local econfargs=(
+		--program-transform-name="${xform}"
+		$(vice-multi_enable gtk desktop-files)
+		$(vice-multi_enable gtk native-gtk3ui)
+		$(vice-multi_enable headless headlessui)
+		$(vice-multi_enable sdl sdlui2)
+		$(usex debug $(vice-multi_enable gtk debug-gtk3ui) --disable-debug-gtk3ui)
+		$(use_enable cpuhistory)
+		$(use_enable debug)
+		$(use_enable doc pdf-docs)
+		$(use_enable ethernet)
+		$(use_enable ffmpeg external-ffmpeg)
+		$(use_enable lame)
+		$(use_enable openmp)
+		$(use_enable parport libieee1284)
+		$(use_enable portaudio)
+		$(use_with alsa)
+		$(use_with flac)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mpg123)
+		$(use_with ogg vorbis)
+		$(use_with oss)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with zlib)
+		$(usex alsa --enable-midi $(use_enable oss midi))
+		$(usex pci '' ac_cv_header_pci_pci_h=no)
+		--disable-arch
+		--disable-sdlui
+		--enable-realdevice
+		ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif
+
+		# $(use_with curl libcurl) # new in 3.6 but is a unused placeholder
+		# --enable-io-simulation # likewise
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir emake
+}
+
+src_install() {
+	# Get xdg-desktop-menu to play nicely while doing the install.
+	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
+
+	XDG_UTILS_INSTALL_MODE=system \
+	XDG_DATA_DIRS="${ED}"/usr/share \
+	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
+		multibuild_foreach_variant run_in_build_dir default
+
+	rm -f "${ED}"/usr/share/applications/*.cache || die
+
+	vice-install_extras() {
+		docinto html
+		dodoc doc/html/*.{html,css}
+		dodoc -r doc/html/images
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins doc/vim/ftdetect/*.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins doc/vim/syntax/*.vim
+	}
+	multibuild_for_best_variant run_in_build_dir vice-install_extras
+}
--- a/dev-embedded/acme/Manifest
+++ b/dev-embedded/acme/Manifest
@ -1,4 +1,4 @@
 DIST acme-sources-0.96.4.zip 403868 BLAKE2B b57d4e1f399fca0bef0a64556982e48cfd47c54696e514d3e6511cc19b87de613949b0fc7f779413a80efe6f61a6e660fdd66c58cbe4a30b71ce0202ef5e8614 SHA512 7a76b4ed98f8793fdac6bf023160e9d5fc12d4ea415921a4c2926c9f4a890080578f46bdb821021def780ae301851f7b09cdf52f5799cb2045e318a8704d9f5e
-EBUILD acme-0.96.4.ebuild 1078 BLAKE2B 1bbb3f1bb32423b2d5a1ba6342c8363b2bc517f3f4d234f71138da273476ddcd8aa07edea61c309b3b8d2f23234c567b8c27bbc894e91c4778173d67e4f12f11 SHA512 d3a3ed2db69edd29133d877c07b8074ff1001120947f4715eb5b1b9b2e9677444e4936fb7bb9a6b1bb46e5711680d2cce3c438fd7e98403d5953294f8f0b506d
+EBUILD acme-0.96.4-r1.ebuild 1086 BLAKE2B 2001524a1880800c2586d63f8ec6245ea47848e0997233f204b66a15ce3a569e4065787d88eebd20cbdd386b4a1c3547f3c6f7c6a606f49e2b534f947285a73a SHA512 ba22c55cccf0aaa9676b0eea7fe9e906d0c8110b069dc207e3c8667f464e70d856fac0731cbd47f90cabc75b099989f9b09c334200e77ef0f05b2e39e3d6a008
 MISC ChangeLog 3435 BLAKE2B 8fcd42d35073f0c6a4e3fc7e5ccc3546655aa0b7e5c9b9a1fd39178e2cfe12063e881f38e2f0bac802d37026d1746a1d82382017e8553fc7958757640109c9dc SHA512 697503823ef66475d816025b167e9ab0c20f054a360270c8d741bd77810806f35aa7f3add0724755a3bf1218e9f0dca62e1c0ea31d810f70b43f6529d8661049
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
--- a/dev-embedded/acme/acme-0.96.4-r1.ebuild
+++ b/dev-embedded/acme/acme-0.96.4-r1.ebuild
@ -7,8 +7,8 @@ EAPI="5"
 inherit eutils toolchain-funcs multilib

 DESCRIPTION="ACME is a free cross assembler, It can produce code for the following processors: 6502, 6510 (including illegal opcodes), 65c02 and 65816."
-HOMEPAGE="https://github.com/meonwax/acme"
-SRC_URI="https://github.com/meonwax/${PN}/archive/master.zip -> ${PN}-sources-${PV}.zip"
+HOMEPAGE="https://github.com/martinpiper/acme"
+SRC_URI="https://github.com/martinpiper/${PN}/archive/master.zip -> ${PN}-sources-${PV}.zip"

 LICENSE="GPL-2"
 SLOT="0"
--- a/dev-embedded/arduino-bin/Manifest
+++ b/dev-embedded/arduino-bin/Manifest
@ -1,8 +1,8 @@
 AUX 10arduino-bin 69 BLAKE2B 7e420563bc46a63b26b1df1099b20f41acf45d1996cdccd77d516f2b4e9a222aa4fe4ea6c1896ade562a13513b251d3dfd92fe4324dd1ed39018a8c41e3d3510 SHA512 8bace112decfd895fdf45821dfd96fe868032a8da184dc383dce3a2173fba9fdee103f134b7a7dc8bd5364e598f6249455f0f3d624fceaff7dd7974378ce0192
 AUX arduino.1 15213 BLAKE2B cb1c41c0a7345812344d41a55115f534e445b5c6f789309e8a9f422e76117d5f10d475692717dff377691098850248d6c3297dd1cbe517e4cbd28c6232ade713 SHA512 837cae1a434152ac507a0e229e384077392024d01db4d7b9d9820bfbe8877c4822c3f52467a7c02756c04958af9e8464925a254703d2ed9ca75b51e5e917f88a
 AUX arduino.desktop 274 BLAKE2B 1a2ad9fc7bd99f2c4517713abc62135777767000c3c9bb8d03fb5a0a50a0315d0776c3efe4a1d8b4958eb963b19f85199435362947c85e7e37832c4570e2cc2b SHA512 d9c4f65b720ad0b6a5874e4fb6cf4c4ebccaf3e97451984c6aec75b3c83630e209be0c045c6b731c582ec78e47240006678f182fa1d671fc0459382755d8ac8c
-DIST TeensyduinoInstall-154-beta12.linux32 73398680 BLAKE2B 4c5cc3666686c7b1f272e4eaf98440d8eef4d42f64e0ee244773d0518801befd511fa9e6a3937d274ec20ec3e2b8e9780de95b921ede48690f93132e9078f70d SHA512 4886cccec3e587fee90c55d02279a951931ac367508f253df675d3b74f7d697d512ce2e61bba9568a934ea29abc9bcc8b8c69085c8db35b72163947bfb642ad7
-DIST TeensyduinoInstall-154-beta12.linux64 73398680 BLAKE2B 4c5cc3666686c7b1f272e4eaf98440d8eef4d42f64e0ee244773d0518801befd511fa9e6a3937d274ec20ec3e2b8e9780de95b921ede48690f93132e9078f70d SHA512 4886cccec3e587fee90c55d02279a951931ac367508f253df675d3b74f7d697d512ce2e61bba9568a934ea29abc9bcc8b8c69085c8db35b72163947bfb642ad7
-DIST arduino-1.8.15-linux32.tar.xz 134054724 BLAKE2B 2105e6598403c9bbb781b92a1414bfc707a4a94865d7c62afdfb9748e7d52e22df8c91225bfb288aea342520b4b7e07bc9118649384ec8742ab7d9b7c9c59dc4 SHA512 02a10831c7125144ac6f701528f9d176a1a7ac0df6d9391d31d6758ae8f3dea3f8b8390320c7e7d3efb9ed45fb79527caa798ad354bc8a857c2f9c42f4612a8f
-DIST arduino-1.8.15-linux64.tar.xz 131705480 BLAKE2B 5fef93baf6c6f7e8a5e1e0b0dfca5080e45e6a3b9398614edf082bc8a1757ce2d03e912f76e9f589c99dc2e21e4c8e9a937ce07ea8d044d550833c54ea24c225 SHA512 ae84a8f62cbd3ecf5400a357ac5ebd04cbc80b31a2fbc80f280850465f7460ad3a02b32830021ef980b72c60d52eb65a4fc551988c91d01b25e8d646596175f8
-EBUILD arduino-bin-1.8.15.ebuild 1391 BLAKE2B 11153e6be31d57e4075d9f575df8ee7e9be50d3978247b7226b508f6457721731054f42c6fd9be4069b211d15963a8552a9ecc3d78f5395c4df7efc8305a926c SHA512 53e68ce77f7d58c64ea7f3e917280a17383f202c6b132af4d790914e874995337c54f8005d1e533557ba40fc8ffc33ca4a48af4d68985235bfeb1dd7a4860df4
+DIST TeensyduinoInstall-156.linux32 95219640 BLAKE2B 56e0de4110ddb38b681bf2245f8428b071e3b4aaa53254a393d3c4c268e674d3fa86e7e545bedd79a86acedc51729435095db1030966cd838b6988f39743e389 SHA512 cff4edfe40d4c74793f90ac8d50205beefb7c44b02835a10bad0771c8f27b50bb4124e009ac8a447c9287cdecc49d5374fe0093346c8195baa6927eaa940e6db
+DIST TeensyduinoInstall-156.linux64 95219640 BLAKE2B 56e0de4110ddb38b681bf2245f8428b071e3b4aaa53254a393d3c4c268e674d3fa86e7e545bedd79a86acedc51729435095db1030966cd838b6988f39743e389 SHA512 cff4edfe40d4c74793f90ac8d50205beefb7c44b02835a10bad0771c8f27b50bb4124e009ac8a447c9287cdecc49d5374fe0093346c8195baa6927eaa940e6db
+DIST arduino-1.8.19-linux32.tar.xz 130946688 BLAKE2B 99fa0bef52224b2a358b6c3390981b13fcbfc1b0e64b5e5ad9bc7ffe498e3f11f5efbfe319e4d682e95f4e1735ffd8487b40b0f42dc84b77b010ef885897005f SHA512 b18d0fe8dbc3aaddb58706e1d2e87047d746357418bf3ea308ee388be0d83867bd08d54a1e7a96a239cb95e0b5733d7d68f23cf6585bb2aa7eeec55bf02544d1
+DIST arduino-1.8.19-linux64.tar.xz 128583740 BLAKE2B 7e38710540e17dd407289654bb459ef5788e36d25cc6e71086e01cc0318aa75e6d8a15a171926274b60b3b181f7c685c22cd8d0ba2f49b2d4019fafaa777c4e2 SHA512 9328abf8778200019ed40d4fc0e6afb03a4cee8baaffbcea7dd3626477e14243f779eaa946c809fb153a542bf2ed60cf11a5f135c91ecccb1243c1387be95328
+EBUILD arduino-bin-1.8.19.ebuild 1384 BLAKE2B 983875f6bd2fa1dea84983d2bbd02504b0ec1fca0db7e1587e239e6d1152de64a28267cd7f14fc69a840e3cb5ca3f344163e90f78b19c91bb1adac1155f902ed SHA512 186495a67840b773c7422f4bbce9a7a3f55e6c001dd0cef877ffe49008dfcd4d34571ae3c570685f1cc4155458c792431625f3cb66ea35b1e82e8afdd4d73b2e
--- a/dev-embedded/arduino-bin/arduino-bin-1.8.19.ebuild
+++ b/dev-embedded/arduino-bin/arduino-bin-1.8.19.ebuild
@ -7,7 +7,7 @@ inherit eutils

 DESCRIPTION="electronics prototyping platform based on easy-to-use hardware and software"
 HOMEPAGE="https://www.arduino.cc/ https://www.pjrc.com/teensy/"
-TEENSY_PV="154-beta12"
+TEENSY_PV="156"
 MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="
--- a/dev-embedded/cc65/Manifest
+++ b/dev-embedded/cc65/Manifest
@ -1,8 +1,4 @@
-AUX cc65-2.13.2-asneeded-1.patch 4394 BLAKE2B 3e54a7bf09282f87f6cf6ed8bff08fa9e86d23d7a7968a51aa8dee14b9db31528546ff2d4f51ac29c89d1c6742dbe2ef9305443adaac0989502d41a2598ec5e6 SHA512 98df2303b43c6bb390366d0d5b13a59648a4869c73891114790c9ad7e1cceec22daa3ae171b283ad1e220d35352c15bbc873666b5430eba05e6e6238d6027447
-AUX package-version.patch 2046 BLAKE2B b4a74650e9226dfe677a9edcc84ab17cb055f2c161a5787b8dfd4d96f8e321027acba913340c2ecdbe51a89fc3b7816d48daf06d50037609f97e2610e270f31f SHA512 5658a26b7f7ae020f5f16702b5833913bbd0d7ca1d54cf370c72fe7af00ea582f0a3bd2ee8b4b580f2d6f215807687c4e1cfe9ae5892cfb8e6de6bcfe2196871
-DIST cc65-sources-2.13.3.tar.bz2 1103245 BLAKE2B d111a6354176e5fbfacfcc65a26d10a33868660c674cf0ea614a55748c3e8087be33901801ec038fd21db51459ccaca57a2aeb3ab0c0825771819c95eb64ef5d SHA512 135004bdd50abc749409f4a3efbc5c93a09e940d787b6a2034df4de8459e78fa5f813e2e0673cdf9f8bf50c6df8b1313b36ff395d6e82560d0e669da03130776
-DIST cc65-sources-2.18.tar.gz 2254374 BLAKE2B 2a7a41aca7a8ae300f6b8bd65d083741fc6bad92f37187bae4ffd720c1e0de500e631c765b34dda8fdd36e87d6039daac339348396733a3a92046f5746bec279 SHA512 47e530052911c8fdac0ea560fef78f5971441509f37b4020df54937cf9b5420e07653b3d191c844da0af5dddd17a61e90c3ad3fb56bf7623214977017b4bc9a1
-EBUILD cc65-2.13.3.ebuild 2937 BLAKE2B 3194bf88c19049f831b1d0d4bb3befb86386d2946f78ec36c09bbdb5c671e3ee34e3fa344bb49564f2a9546d89390cefa7a907cfc4004c324dc2eb5c96b7b6e4 SHA512 d5d64a98e11c036b0853fc3296198da792820c699af0f841fcc98405222a32855a3887996c7f223ef728f4d1218359ef1f5fbcf94a15265bca8033709f7a756e
-EBUILD cc65-2.18.ebuild 1561 BLAKE2B 35e2946d5e32c932f45cc4954b22af8d18109adfa89ff51d67adf3fafe0fbdfd68d514459d3a06ed38e8ac68711ecfc07109296b15eb43d96e069613e26457cf SHA512 5c7e3f02f490f5d1eb4c525789046eeb432fe1d62bdc39fdad8d1aadccc4335c3dbc52c39ef4c9d1436ce71ad9d72eb856d8bae878de52c6dfecb02e29017830
+DIST cc65-sources-2.19.tar.gz 2284735 BLAKE2B c1c845417e38113c99a9ec8fbff1b90e292798582ac2b394e40419eff3eea62d838ea52165188516efc6157ef02aa7fc23c5a6510fd40d1012ad2b5231d78097 SHA512 e893359249588247d262ff19b8b7efbbcb10a274964aaa18cfe21830cce39da53831262bcc8ee4678158c0e0ab56905411b037699d1097aa5fc03edf7d6bea8f
+EBUILD cc65-2.19.ebuild 1569 BLAKE2B d093e2dc33e4f632829cb08ddf8ddbdd62bb37f858cc916abd378068363322acce1817e0b95b10a799e12e78058cf641ff5728e17700604681afe662c58388c2 SHA512 a96cec28ddcf9826da8369250eb7fb6b5fe0130c10c80021357458fc47bcc2868ce1134a7ef09fb9809e2e9bd1fd696b945d0adf001f7fee8f41eb9cadb0cfba
 MISC ChangeLog 3435 BLAKE2B 8fcd42d35073f0c6a4e3fc7e5ccc3546655aa0b7e5c9b9a1fd39178e2cfe12063e881f38e2f0bac802d37026d1746a1d82382017e8553fc7958757640109c9dc SHA512 697503823ef66475d816025b167e9ab0c20f054a360270c8d741bd77810806f35aa7f3add0724755a3bf1218e9f0dca62e1c0ea31d810f70b43f6529d8661049
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
--- a/dev-embedded/cc65/cc65-2.13.3.ebuild
+++ b/dev-embedded/cc65/cc65-2.13.3.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="It's a complete cross development package for 65(C)02 systems"
-HOMEPAGE="http://www.cc65.org"
-#SRC_URI="ftp://ftp.musoftware.de/pub/uz/cc65/snapshot/cc65-snapshot-sources-${PV}.tar.bz2"
-SRC_URI="ftp://ftp.musoftware.de/pub/uz/${PN}/${PN}-sources-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-text/linuxdoc-tools )"
-RDEPEND=""
-
-#S="${WORKDIR}"/${PN}-snapshot-${PV}
-
-src_prepare() {
-	# uncomment to install sim65
-	#sed -i -e "s:od65:od65 sim65:g" src/make/gcc.mak
-
-	# correct paths for install (also in documentation)
-	sed -i -e "s:)/lib:)/$(get_libdir):g" make/gcc.mak
-	sed -e "s:/usr/lib/cc65:/usr/$(get_libdir)/cc65:g" \
-	    -i src/ca65/make/gcc.mak -i doc/ca65.sgml \
-	    -i src/cc65/make/gcc.mak -i doc/cc65.sgml \
-	    -i src/ld65/make/gcc.mak -i doc/ld65.sgml
-
-	# solve conflict by renameing make.info to cc65make.info
-	sed -e "s:make.:cc65make.:g" -i doc/index.sgml -i doc/Makefile
-	mv doc/make.sgml doc/cc65make.sgml
-
-#	epatch "${FILESDIR}"/cc65-2.13.2-asneeded-1.patch
-}
-
-src_compile() {
-	# the build needs to be split otherwise we can't specify CC
-	# these makefiles are not parallel build aware
-	emake -j1 -C src -f make/gcc.mak CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		CFLAGS="-g -O2 -Wall -W -std=c89 ${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die "src build fail"
-	emake -j1 -C libsrc || die "libsrc build fail"
-	use doc && emake -j1 -C doc html info
-}
-
-src_install() {
-	# can't trust the install target (sandbox violation) so do it by hand
-	dobin src/*65/*65 src/ca65html/ca65html src/grc/grc  || die "dobin fail"
-	insinto /usr/$(get_libdir)/cc65/emd
-	doins libsrc/*.emd || die "install memory map fail"
-	insinto /usr/$(get_libdir)/cc65/joy
-	doins libsrc/*.joy || die "install joystick driver fail"
-	insinto /usr/$(get_libdir)/cc65/mou
-	doins libsrc/*.mou || die "install mouse driver fail"
-	insinto /usr/$(get_libdir)/cc65/ser
-	doins libsrc/*.ser || die "install UART driver fail"
-	insinto /usr/$(get_libdir)/cc65/tgi
-	doins libsrc/*.tgi || die "install graphic driver fail"
-	insinto /usr/$(get_libdir)/cc65/asminc
-	doins asminc/*.inc || die "install asm include fail"
-	insinto /usr/$(get_libdir)/cc65/include
-	doins -r include/* || die "install include fail"
-	insinto /usr/$(get_libdir)/cc65/lib
-	doins libsrc/*.lib || die "install lib definations fail"
-	doins libsrc/*.o || die "install lib fail"
-	insinto /usr/$(get_libdir)/cc65/cfg
-	doins src/ld65/cfg/*.cfg || die "cfg install fail"
-	use doc && dohtml doc/*.htm*
-	use doc && insinto /usr/share/doc/${PF}/html
-	use doc && doins doc/*.txt
-	doman packages/debian/*.1 || die "man install fail"
-	use doc && doinfo doc/*.info
-	dodoc src/ca65/macpack/*.mac doc/readme.1st \
-		doc/BUGS doc/CREDITS || die "macro & doc install fail"
-}
--- a/dev-embedded/cc65/cc65-2.19.ebuild
+++ b/dev-embedded/cc65/cc65-2.19.ebuild
@ -22,20 +22,20 @@ RDEPEND=""

 #S="${WORKDIR}"/${PN}-snapshot-${PV}

-src_prepare() {
-	epatch "${FILESDIR}"/package-version.patch
-}
+#src_prepare() {
+#	epatch "${FILESDIR}"/package-version.patch
+#}

 src_compile() {
 	# the build needs to be split otherwise we can't specify CC
 	# these makefiles are not parallel build aware
-	emake -C src CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="/usr" PKG_VERSION="gentoo ${PVR}" || die "src build fail"
-	emake -C libsrc CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="/usr" PKG_VERSION="gentoo ${PVR}" || die "libsrc build fail"
+	emake -C src CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="/usr" BUILD_ID="Gentoo ${PV}${PR}" || die "src build fail"
+	emake -C libsrc CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="/usr" BUILD_ID="Gentoo ${PV}${PR}" || die "libsrc build fail"
 	use doc && emake -C doc html info
 }

 src_install() {
-	emake -C src CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" PKG_VERSION="gentoo ${PVR}" install || die "src install failed"
-	emake -C libsrc CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" PKG_VERSION="gentoo ${PVR}" install || die "libsrc install failed"
-	use doc && emake CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" PKG_VERSION="gentoo ${PVR}" doc html info
+	emake -C src CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" BUILD_ID="Gentoo ${PV}${PR}" install || die "src install failed"
+	emake -C libsrc CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" BUILD_ID="Gentoo ${PV}${PR}" install || die "libsrc install failed"
+	use doc && emake CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" BUILD_ID="Gentoo ${PV}${PR}" doc html info
 }
--- a/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch
+++ b/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch
@ -1,127 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2010-11-07
-Initial Package Version: 2.13.2
-Origin: me
-Upstream Status: unknown
-Description: correct the linkorder in the make files
- 
-diff -Naur cc65-2.13.2.orig/src/ar65/make/gcc.mak cc65-2.13.2/src/ar65/make/gcc.mak
--- cc65-2.13.2.orig/src/ar65/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/ar65/make/gcc.mak	2010-11-07 05:51:00.000000000 +0000
-@@ -51,7 +51,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- clean:
-diff -Naur cc65-2.13.2.orig/src/ca65/make/gcc.mak cc65-2.13.2/src/ca65/make/gcc.mak
--- cc65-2.13.2.orig/src/ca65/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/ca65/make/gcc.mak	2010-11-07 05:50:17.000000000 +0000
-@@ -93,7 +93,7 @@
- endif
- 
- $(EXE):	$(INCS) $(OBJS) $(LIBS)
-	$(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- inc:	$(INCS)
-diff -Naur cc65-2.13.2.orig/src/cc65/make/gcc.mak cc65-2.13.2/src/cc65/make/gcc.mak
--- cc65-2.13.2.orig/src/cc65/make/gcc.mak	2010-11-07 05:47:24.000000000 +0000
-+++ cc65-2.13.2/src/cc65/make/gcc.mak	2010-11-07 05:48:00.000000000 +0000
-@@ -127,7 +127,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -lm -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- .PHONY:	svnversion
-diff -Naur cc65-2.13.2.orig/src/cl65/make/gcc.mak cc65-2.13.2/src/cl65/make/gcc.mak
--- cc65-2.13.2.orig/src/cl65/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/cl65/make/gcc.mak	2010-11-07 05:51:15.000000000 +0000
-@@ -44,7 +44,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- clean:
-diff -Naur cc65-2.13.2.orig/src/co65/make/gcc.mak cc65-2.13.2/src/co65/make/gcc.mak
--- cc65-2.13.2.orig/src/co65/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/co65/make/gcc.mak	2010-11-07 05:50:34.000000000 +0000
-@@ -44,7 +44,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- clean:
-diff -Naur cc65-2.13.2.orig/src/da65/make/gcc.mak cc65-2.13.2/src/da65/make/gcc.mak
--- cc65-2.13.2.orig/src/da65/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/da65/make/gcc.mak	2010-11-07 05:49:57.000000000 +0000
-@@ -58,7 +58,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- clean:
-diff -Naur cc65-2.13.2.orig/src/grc/make/gcc.mak cc65-2.13.2/src/grc/make/gcc.mak
--- cc65-2.13.2.orig/src/grc/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/grc/make/gcc.mak	2010-11-07 05:50:47.000000000 +0000
-@@ -38,7 +38,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- clean:
-diff -Naur cc65-2.13.2.orig/src/ld65/make/gcc.mak cc65-2.13.2/src/ld65/make/gcc.mak
--- cc65-2.13.2.orig/src/ld65/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/ld65/make/gcc.mak	2010-11-07 05:49:43.000000000 +0000
-@@ -100,7 +100,7 @@
- endif
- 
- $(EXE):	$(INCS) $(OBJS) $(LIBS)
-	$(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- inc:	$(INCS)
-diff -Naur cc65-2.13.2.orig/src/od65/make/gcc.mak cc65-2.13.2/src/od65/make/gcc.mak
--- cc65-2.13.2.orig/src/od65/make/gcc.mak	2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/od65/make/gcc.mak	2010-11-07 05:49:09.000000000 +0000
-@@ -44,7 +44,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- clean:
-diff -Naur cc65-2.13.2.orig/src/sim65/make/gcc.mak cc65-2.13.2/src/sim65/make/gcc.mak
--- cc65-2.13.2.orig/src/sim65/make/gcc.mak	2010-11-07 05:47:24.000000000 +0000
-+++ cc65-2.13.2/src/sim65/make/gcc.mak	2010-11-07 05:48:47.000000000 +0000
-@@ -53,7 +53,7 @@
- endif
- 
- $(EXE):	$(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 	@if [ $(OS2_SHELL) ] ;	then $(EBIND) $(EXE) ; fi
- 
- .PHONY:	chips
--- a/dev-embedded/cc65/files/package-version.patch
+++ b/dev-embedded/cc65/files/package-version.patch
@ -1,47 +0,0 @@
-Description: Allow overriding git hash in version string with package version
- When compiling cc65, it will place the git hash of the checked out commit in
- the version string which isn't useful when building a distribution package
- since there either won't be an upstream git hash if there is one at all. Make
- it so that if the variable PKG_VERSION is defined when building, its contents
- will be placed into the version string instead of the git hash.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2017-11-16
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: cc65work/src/Makefile
-===================================================================
--- cc65work.orig/src/Makefile	2017-11-16 01:54:30.795532327 +0100
-+++ cc65work/src/Makefile	2017-11-16 02:21:19.661770273 +0100
-@@ -62,11 +62,16 @@ else
-   endif
- endif
- 
-+ifdef PKG_VERSION
-+  $(info PKG_VERSION: $(PKG_VERSION))
-+  DEF_PKGVER := -DPKG_VERSION="$(PKG_VERSION)"
-+endif
-+
- CFLAGS += -MMD -MP -O3 -I common \
-           -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
-           -DCA65_INC="$(CA65_INC)" -DCC65_INC="$(CC65_INC)" -DCL65_TGT="$(CL65_TGT)" \
-           -DLD65_LIB="$(LD65_LIB)" -DLD65_OBJ="$(LD65_OBJ)" -DLD65_CFG="$(LD65_CFG)" \
-          -DGIT_SHA=$(GIT_SHA)
-+          -DGIT_SHA=$(GIT_SHA) $(DEF_PKGVER)
- 
- LDLIBS += -lm
- 
-Index: cc65work/src/common/version.c
-===================================================================
--- cc65work.orig/src/common/version.c	2017-11-16 01:54:30.815532304 +0100
-+++ cc65work/src/common/version.c	2017-11-16 02:07:10.974699766 +0100
-@@ -61,7 +61,9 @@
- /* Returns the version number as a string in a static buffer */
- {
-     static char Buf[60];
-#if defined(GIT_SHA)
-+#if defined(PKG_VERSION)
-+    xsnprintf (Buf, sizeof (Buf), "%u.%u - %s", VER_MAJOR, VER_MINOR, STRINGIZE (PKG_VERSION));
-+#elif defined(GIT_SHA)
-     xsnprintf (Buf, sizeof (Buf), "%u.%u - Git %s", VER_MAJOR, VER_MINOR, STRINGIZE (GIT_SHA));
- #else
-     xsnprintf (Buf, sizeof (Buf), "%u.%u", VER_MAJOR, VER_MINOR);
--- a/dev-java/ICEpdf/ChangeLog
+++ b/dev-java/ICEpdf/ChangeLog
@ -1,61 +0,0 @@
-# ChangeLog for dev-java/ICEpdf
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> ICEpdf-4.4.0.ebuild,
-  ICEpdf-5.0.7.ebuild:
-  Bump batik
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> ICEpdf-4.4.0.ebuild,
-  ICEpdf-5.0.7.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com> ICEpdf-4.4.0.ebuild,
-  ICEpdf-5.0.7.ebuild:
-  keyword arm
-
-*ICEpdf-4.4.0 (13 Aug 2014)
-*ICEpdf-5.0.7 (13 Aug 2014)
-
-  13 Aug 2014; Mario Fetka <mario.fetka@gmail.com> +ICEpdf-4.4.0.ebuild,
-  +ICEpdf-5.0.7.ebuild, -ICEpdf-5.0.5.ebuild, -ICEpdf-5.0.6_p01.ebuild:
-  sloting
-
-*ICEpdf-5.0.6_p01 (14 Jul 2014)
-
-  14 Jul 2014; Mario Fetka <mario.fetka@gmail.com> +ICEpdf-5.0.6_p01.ebuild:
-  Bump
-
-*ICEpdf-5.0.5 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> +ICEpdf-5.0.5.ebuild,
-  -ICEpdf-5.0.4.ebuild:
-  Bump
-
-*ICEpdf-5.0.4 (16 Oct 2013)
-
-  16 Oct 2013; Mario Fetka <mario.fetka@gmail.com> +ICEpdf-5.0.4.ebuild,
-  -ICEpdf-5.0.3.ebuild:
-  Bump
-
-*ICEpdf-5.0.3 (10 Aug 2013)
-
-  10 Aug 2013; Mario Fetka <mario.fetka@gmail.com> +ICEpdf-5.0.3.ebuild,
-  -ICEpdf-5.0.0.ebuild:
-  Bump
-
-*ICEpdf-5.0.0 (16 Apr 2013)
-
-  16 Apr 2013; Mario Fetka <mario.fetka@gmail.com> +ICEpdf-5.0.0.ebuild,
-  -ICEpdf-4.3.4.ebuild:
-  Bump to new verison
-
-*ICEpdf-4.3.4 (27 Oct 2012)
-
-  27 Oct 2012; Mario Fetka <mario.fetka@gmail.com> -ICEpdf-4.2.2.ebuild,
-  +ICEpdf-4.3.4.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> ICEpdf-4.2.2.ebuild,
-  +metadata.xml:
-  initial checkin
--- a/dev-java/ICEpdf/ICEpdf-4.4.0.ebuild
+++ b/dev-java/ICEpdf/ICEpdf-4.4.0.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java PDF Renderer"
-HOMEPAGE="http://www.icepdf.org/"
-SRC_URI="${PN}-${PV/_p/-P}-src.zip"
-RESTRICT="fetch"
-
-LICENSE="MPL-1.1"
-SLOT="4"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/batik:1.8"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}-${PV/_p/-P}-src/icepdf
-
-java_prepare() {
-	cd lib || die
-	rm -vf *.jar || die
-	java-pkg_jar-from batik-1.8
-}
-
-EANT_BUILD_TARGET="build.jars"
-
-src_install() {
-	java-pkg_dojar lib/icepdf-core.jar lib/icepdf-viewer.jar
-	use source && java-pkg_dosrc core/src viewer/src
-}
--- a/dev-java/ICEpdf/ICEpdf-5.0.7.ebuild
+++ b/dev-java/ICEpdf/ICEpdf-5.0.7.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java PDF Renderer"
-HOMEPAGE="http://www.icepdf.org/"
-SRC_URI="${PN}-${PV}-src.zip"
-RESTRICT="fetch"
-
-LICENSE="MPL-1.1"
-SLOT="5"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/batik:1.8"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}-${PV}-src/icepdf
-
-java_prepare() {
-	cd lib || die
-	rm -vf *.jar || die
-	java-pkg_jar-from batik-1.7
-}
-
-EANT_BUILD_TARGET="build.jars"
-
-src_install() {
-	java-pkg_dojar lib/icepdf-core.jar lib/icepdf-viewer.jar
-	use source && java-pkg_dosrc core/src viewer/src
-}
--- a/dev-java/ICEpdf/Manifest
+++ b/dev-java/ICEpdf/Manifest
@ -1,6 +0,0 @@
-DIST ICEpdf-4.4.0-src.zip 2299659 SHA256 ba37f88b52294c740007ccb68bc81957b1eda2b1a2828642e2c174170eaec5dd SHA512 57f37ff72bb3c7715376bb5f1511fc8ed242eb0528a7b7560728caaac0fbe0fef4ab4f0791978c5612d0c4b1f99275bae562ccc4d94a9eecf80788d4217459ad WHIRLPOOL 1ac73b6ea1dbcba091f597fcf23e61f71394f86ef8d8e8f10be62147cdd7614a94f60e08afad5c7d34312a46369054a76413f229cf3a8c37c29fbefc68fc1377
-DIST ICEpdf-5.0.7-src.zip 3178349 SHA256 c9895d1512b5f7716bb24d4098de7a2cb17f3f8b86dd6d7f54a61ae9d0326d15 SHA512 3db9af37729e92a5de955d0e9ea56d65b3caf93052480e98cef04141a1fd89a632dc619632fd2917c1dede5c6bfd3be075b65d5996cda9383abf0fc4f3f93050 WHIRLPOOL 1d2696a17d264840939dcf81fb6178c1d2ef04969092a9f0e68b09833eadca0314af5794f2375506a7d1d2116e7d26829bae594d8ed8ae4defc4b42529667ae6
-EBUILD ICEpdf-4.4.0.ebuild 789 SHA256 88d0c516313d7ddf3c27acc32a25da3aa3baf54d8618c606fdff73732f196097 SHA512 458502a3b77fc531705e8d60ff0875abb5942df526a62278cba903ef12774cf0e43ac04fd01dc1a89de654fbcdec9a77d8676eb468669c349478ed064a8183f3 WHIRLPOOL 85cf904ea7d1af0fd1540620b6cb4e6cefbf863b8f83159507faf79f53b57a36c1476a84df184da52f65d2b7341e15da91b2a01c77a14ea05fd16f3c00bc6e23
-EBUILD ICEpdf-5.0.7.ebuild 777 SHA256 954756154cda665f282112d6cd695846b3262b04215cf1d5a91b35d2d746da05 SHA512 11e75fdaf57f5b6ee19df40c89bb60a190fdee29a41d1a642f852fd496877ca44d9061fdfe390e4d1b19d51d40b50a3f41d30d9e9be1298e079799ceca7295ef WHIRLPOOL 7ea8bf0da461f3720f5c892e284c2c6a120cc8853960ef46912d1216aa3000e39fb117b986275180d6866d960a6b3d1e4a713a6545d118a2ead33ad754351a8b
-MISC ChangeLog 1570 SHA256 2a76ac4309f29a0c2956c0da486419756ca4a215566ff4bebdd3b0d8ec8ad486 SHA512 008eb4392f4cb70c9190f9e5c8024d71eba4aedbe65eed0e924947c7583af5836351b5675f2bc55bb45101b8722f70b542a1b7715b7fe86f9525242595d50cfb WHIRLPOOL 59f2b3464cd3bc6c9d823fdb9c1f8f31a5811b3fbc472d750dc19cef647dee9dfa1373dc36b65048d4e6683c44a5b93c6807f9990db95ffdfc7b3cc303fc8c28
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/ICEpdf/metadata.xml
+++ b/dev-java/ICEpdf/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/iscwt/ChangeLog
+++ b/dev-java/iscwt/ChangeLog
@ -1,61 +0,0 @@
-# ChangeLog for dev-java/iscwt
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  08 Aug 2015; Mario Fetka <mario.fetka@gmail.com> iscwt-5.5.20120626.ebuild:
-  use old swt
-
-  08 Aug 2015; Mario Fetka <mario.fetka@gmail.com> iscwt-5.5.20120626.ebuild:
-  correct classpath deeps
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> iscwt-5.5.20120626.ebuild:
-  Bump swt
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> iscwt-5.5.20120626.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com> iscwt-5.5.20120626.ebuild:
-  keyword arm
-
-*iscwt-5.5.20120626 (13 Aug 2014)
-
-  13 Aug 2014; Mario Fetka <mario.fetka@gmail.com> +iscwt-5.5.20120626.ebuild,
-  -iscwt-5.5.20131203.ebuild:
-  downgrade
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> files/build.xml,
-  iscwt-5.5.20131203.ebuild:
-  Update Requ to 1.7 java
-
-*iscwt-5.5.20131203 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> +iscwt-5.5.20131203.ebuild,
-  -iscwt-5.5.20120626.ebuild:
-  Bump
-
-*iscwt-5.5.20120626 (27 Oct 2012)
-
-  27 Oct 2012; Mario Fetka <mario.fetka@gmail.com> -iscwt-5.3.20100629.ebuild,
-  +iscwt-5.5.20120626.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> files/build.xml:
-  Correct build on utf8 console and cleanup
-
-  27 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
-  +iscwt-5.3.20100629.ebuild:
-  Bump
-
-  27 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-  +iscwt-5.2.20091102.ebuild:
-  Bump to new upstream version
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  iscwt-5.0.20081218.ebuild, files/build.properties, files/build.xml:
-  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> iscwt-5.0.20081218:
-  correct keywords
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
-  initial checkin
--- a/dev-java/iscwt/Manifest
+++ b/dev-java/iscwt/Manifest
@ -1,6 +0,0 @@
-AUX build.properties 258 SHA256 523c86c348a9d524fbc353f52d85ffc4974395b71d4de59f5b501c1ecf2641a8 SHA512 80ec357ff61336b06e59a0342be30e35885ea667c492b87426bc9f8e8cb8b8224b4a1da6030b8015c1d7ea98e4f48f7a000671d5e54198465e770ff2cd21c97e WHIRLPOOL 4330a6891043b4704621e37b4ef23382ed6fb479ba37eecb427a077107b59fb20aa83db03306ce806ebafe409c20de76c84bb6309899230b5918c73ecfa0e7e3
-AUX build.xml 3491 SHA256 3b3dc69d9e722bb351a0e5bedda67649bece6750b91c37412b30bfdb37d7d39c SHA512 0099c6c98be3a6cd4833684224f1976275a7922ddd8d9204a0b1150ed5224aeac48640de34a866143f9100223365f88e5cf78de2787e119f520bd811cd4b9cc2 WHIRLPOOL 755bacc75b416528ae89e61d4196d18855cc813ddf65d1d19484ee4a774588221a00d87bb2c596af28115ceb5db3cdffbdf74216460412694b19589242a4d313
-DIST isCWT.5.5.20120626.zip 3543336 SHA256 f7a9e96bcb93058853f854277f8d53b7bfe2336f981b275f333d80a7a7fad95d SHA512 baca27de50780860c3346dde96c7f71d8423a7d579f3db7ee4d1ec0ecfd382163e1cbf70afe750bad3a8bb1e3e505fa36096ce4c569a176c58cafa3da1ebe1bf WHIRLPOOL ccc2f6e24220a21cc42d073c6b7774c5dd47297ceec00a8cb97c27f0b1014d30d347c4dc9b79966d875d0a48c57fc28e220cea974425da826ee20f57e121bed3
-EBUILD iscwt-5.5.20120626.ebuild 982 SHA256 2c53c582975255f8c3d106e4e181d8dccae5a81b8295b55bcae12abba8bfa95c SHA512 c899b7133a6729c35d66753c2bdc76f1c409f271b6adff6ea6c3d8e835b6b2805e962d743da5fa16c78fa6e4fcdde17f6d328e75b4044a6d3e97a321fd38ec5a WHIRLPOOL cc019a9b2ff955c6edfc548fe6dbbe2c64264723418a8c1c0be9acbacf91d02e09fccffec1d5da676ef35cf59f8489125a0842452bcc5f510d023991abce039a
-MISC ChangeLog 1853 SHA256 602e6da2f431361963574d6c96852bd374d4d287720a343887af73ceec2c0ce9 SHA512 06d075d81854a14fef15c61957b76c77c9b649ea47daf2a06e3266fa5dcbd71f1f45aa03d46785de70a34cafd1f5f0c482944e651aaad660e4d7422a6bc77b87 WHIRLPOOL f40c97a9785e497aab1d1249dcae4e14ef2843d2da64e836f9df644ae2c396bed65d0c069083316b901e25386e8c013de2977d9d20d1b64a17986d4812751a55
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/iscwt/files/build.properties
+++ b/dev-java/iscwt/files/build.properties
@ -1,12 +0,0 @@
-#where classes are compiled, jars distributed, javadocs created and release created
-build.dir=build
-
-#libraries
-libs.dir=.
-swt.jar.name=swt
-jna.jar.name=jna
-isrt.jar.name=isrt
-isnativec.jar.name=isnativec
-isfreetype.jar.name=isfreetype
-iscwt.jar.name=iscwt
-
--- a/dev-java/iscwt/files/build.xml
+++ b/dev-java/iscwt/files/build.xml
@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="iscwt" default="jar" basedir=".">
-    <description>
-        This is a window toolkit and basic rendering abstraction layer
-    </description>
-  
-  <!-- set global properties for this build -->
-  <property name="user.name" value="intarsys consulting GmbH"/>
-  <property name="iscwt.src.dir" location="src"/>
-  <property name="iscwt.resource.dir" location="resource"/>
-  
-  <target name="init">
-  	<property file="build.properties" />
-
-	<property name="iscwt.build.root" location="${build.dir}/iscwt"/>
-  	<property name="iscwt.build.dir" location="${iscwt.build.root}/build"/>
-    <property name="iscwt.dist.dir"  location="${iscwt.build.root}/dist"/>  	
-    <property name="iscwt.javadoc.dir"  location="${iscwt.build.root}/javadoc"/>
-
-  </target>
-	
-	<target name="make-structure" depends="init">  	
-	    <!-- Create the build directory structure used by compile -->
-	    <mkdir dir="${iscwt.build.dir}"/>
-	  	<mkdir dir="${iscwt.dist.dir}"/>
-	    <mkdir dir="${iscwt.javadoc.dir}"/>
-	</target>
-	
-	<target name="clean" depends="init" description="clean up" >
-	    <!-- Delete the ${dist} directory trees -->
-	    <delete dir="${iscwt.javadoc.dir}"/>
-	    <delete dir="${iscwt.dist.dir}"/>
-	    <delete dir="${iscwt.build.dir}"/>
-	</target>
-	
-  <target name="compile" depends="make-structure" description="iscwt compile" >
-    <!-- Construct classpath -->
-    <path id="iscwt.classpath">
-	 	<fileset dir="${libs.dir}">
-	        <include name="**/${isrt.jar.name}.jar"/>
-	        <include name="**/${isnativec.jar.name}.jar"/>
-	        <include name="**/${isfreetype.jar.name}.jar"/>
-	        <include name="**/${jna.jar.name}.jar"/>
-	        <include name="**/${swt.jar.name}.jar"/>
-	    </fileset>
-    	<pathelement path="${iscwt.build.dir}"/>
-    </path>
-
-    <!-- Compile the java code -->
-    <javac compiler="javac1.7" target="1.7" source="1.7" srcdir="${iscwt.src.dir}" destdir="${iscwt.build.dir}" debug="true" encoding="iso-8859-1">
-    	<classpath refid="iscwt.classpath"/>
-    </javac>
-  </target>
-	
-  <target name="jar" depends="compile" description="generate the distribution" >
-
-    <jar jarfile="${iscwt.dist.dir}/${iscwt.jar.name}.jar" basedir="${iscwt.build.dir}">
-	    <manifest>
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Main-Class" value=""/>
-		    <attribute name="Class-Path" value="${isrt.jar.name}.jar ${isnativec.jar.name}.jar ${isfreetype.jar.name}.jar ${jna.jar.name}.jar ${swt.jar.name}.jar"/>
-	    </manifest>
-<!--	    <fileset dir="${iscwt.resource.dir}">
-        <include name="**/*"/>
-    </fileset> -->
-    </jar>
-    
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc" depends="make-structure">
-    <javadoc
-      packagenames="de.intarsys.cwt.*"
-      sourcepath="${iscwt.src.dir}"
-      destdir="${iscwt.javadoc.dir}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="cwt API"
-      doctitle="cwt API" >
-    <classpath refid="iscwt.classpath"/>
-    </javadoc>
-  </target>
-
-
-  
-  <target name="buildZipSrcPackage" depends="javadoc" description="generate build sources zip package" >
-    <zip destfile="${iscwt.dist.dir}/${iscwt.jar.name}-build-src.zip">
-		<fileset dir="..">
-	    	<include name="iscwt/src/**/*"/>
-    	</fileset>
-		<fileset dir="${build.dir}">
-	    	<include name="iscwt/javadoc/**/*.*"/>
-    	</fileset>
-    	<fileset dir="..">
-    		<include name="iscwt/ant/**/*.*"/>
-    	</fileset>
-     </zip>
-  </target>
-
-</project>
-
--- a/dev-java/iscwt/iscwt-5.5.20120626.ebuild
+++ b/dev-java/iscwt/iscwt-5.5.20120626.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.4,isfreetype,isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a window toolkit and basic rendering abstraction layer."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isCWT.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	    dev-java/swt:3.4
-	    dev-java/isrt:0
-	    dev-java/isnativec:0
-	    dev-java/isfreetype:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-java_prepare() {
-	cp "${FILESDIR}"/build.* "${S}"
-}
-
-src_install() {
-	java-pkg_dojar build/iscwt/dist/iscwt.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/iscwt/javadoc
-}
--- a/dev-java/iscwt/metadata.xml
+++ b/dev-java/iscwt/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/isfreetype/ChangeLog
+++ b/dev-java/isfreetype/ChangeLog
@ -1,51 +0,0 @@
-# ChangeLog for dev-java/isfreetype
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com>
-  isfreetype-5.5.20120626.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com>
-  isfreetype-5.5.20120626.ebuild:
-  keyword arm
-
-*isfreetype-5.5.20120626 (13 Aug 2014)
-
-  13 Aug 2014; Mario Fetka <mario.fetka@gmail.com>
-  +isfreetype-5.5.20120626.ebuild, -isfreetype-5.6.20131203.ebuild:
-  downgrade
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> files/build.xml,
-  isfreetype-5.6.20131203.ebuild:
-  Update Requ to 1.7 java
-
-*isfreetype-5.6.20131203 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com>
-  +isfreetype-5.6.20131203.ebuild, -isfreetype-5.5.20120626.ebuild:
-  Bump
-
-*isfreetype-5.5.20120626 (27 Oct 2012)
-
-  27 Oct 2012; Mario Fetka <mario.fetka@gmail.com>
-  -isfreetype-5.3.20100629.ebuild, +isfreetype-5.5.20120626.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> files/build.xml:
-  Correct build on utf8 console and cleanup
-
-  27 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
-  +isfreetype-5.3.20100629.ebuild:
-  Bump
-
-  27 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-  +isfreetype-5.2.20091102.ebuild:
-  Bump to new upstream version
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  isfreetype-5.0.20081218.ebuild, files/build.properties, files/build.xml:
-  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> isfreetype-5.0.20081218:
-  initial checkin
--- a/dev-java/isfreetype/Manifest
+++ b/dev-java/isfreetype/Manifest
@ -1,6 +0,0 @@
-AUX build.properties 220 SHA256 34a320c7077b9d823c7eec76ced97611f5f9fea131bcb6ee6fc8121dbcad6593 SHA512 940e103d9c039644d17442cc66dae14e99854ec96654a688ac47d3991c2d8192b05f4d7687915751e5f50a40d7b5517c331305116bda36dc9d81bfda61136cf4 WHIRLPOOL 24b0079b6a3b45421b382bb31c1c022d777f6d5bb8352cc774ff43c2f2ef1e489854b132b06d8136b87498532641ec6311b2b3596d9622a3384527a2447472dc
-AUX build.xml 3498 SHA256 1bb1aca1565874e9bb243bd22ceb0484a37a804661f1bc945f3cd7e5cf5a64ae SHA512 371e53b14812d148679c45db9b822cf0265ae3acc9e3f4a85a7f869434e83e80a112f3b042cca5bc10fa0c89c986a5e4c62f66f8c44eee3963556395b3d7dbdb WHIRLPOOL 35184eb2902f27f367939790f5a00a26285cff3de51e31df8479051f64114f096d9950134c589075044e0525ce411d9ac6209e1fab76394fe9c8dcec4fa16050
-DIST isFreetype.5.5.20120626.zip 4527976 SHA256 40e0604e1efc287f6f55f80f23b1b60ec338dc63a1c68cefe9ebff9d30f6602b SHA512 8bfd77dffc3be38e66860db32295892fa92055e3c3d7782576928f3939f70c479307d409cb42e41ce2df6c1e5e87dbc72df246c7f9007139d3d7a360ae19b2e2 WHIRLPOOL e308090161c445631cf9e598f7a0f082f1fc05d787355e06fe84fed35f31c02dc6013f0e93346f70487eb4bd93ae71c459279562a86034434a842d30c08e91f8
-EBUILD isfreetype-5.5.20120626.ebuild 914 SHA256 808a406245ee2537b6a5e7e541266a293bb0d6f02d09618f111e3b8825236e0d SHA512 6ddd89fa17fcf374e9dae8d65c30fffa6752e9908dfb60ec4bf2f6fb5084dadd91d6afdd6cd515703940adfa5214022a5c50dc6c9c60c3d4903cdc436fc58332 WHIRLPOOL f0eba0c9cfab448886d72e7282cc880fccac192d2021864b79df0250f6b531d3789dfd9b63266d07f91dc66d74a4513f03b8cb59c919e04130825909c14ba6f8
-MISC ChangeLog 1572 SHA256 59d13dbd469e6eb95a878a99d9a8d6ec1511c48bef2b9ae1dd7c44ebd55ddb35 SHA512 175fd01604b2e4862b2acc87e337cc74667c7a13750a3e37ab4f3cd2e3380c07d3e5471363f4688ba22ef667ae694ba75d1e38f85e275a736094cf69b2b7eb76 WHIRLPOOL 471e52e93c9e96bd77848abf24cd519568e1bf9596c7fd12767ae6d73709a109dead60824306b599442dcc8516425e9c290b848fdf5e6b750eadfe6b0ab30d83
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/isfreetype/files/build.properties
+++ b/dev-java/isfreetype/files/build.properties
@ -1,10 +0,0 @@
-#where classes are compiled, jars distributed, javadocs created and release created
-build.dir=build
-
-#libraries
-libs.dir=.
-isrt.jar.name=isrt
-jna.jar.name=jna
-isnativec.jar.name=isnativec
-isfreetype.jar.name=isfreetype
-
--- a/dev-java/isfreetype/files/build.xml
+++ b/dev-java/isfreetype/files/build.xml
@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="isfreetype" default="jar" basedir=".">
-    <description>
-        This is a generic native code wrapper
-    </description>
-  
-  <!-- set global properties for this build -->
-  <property name="user.name" value="intarsys consulting GmbH"/>
-  <property name="isfreetype.src.dir" location="src"/>
-  <property name="isfreetype.resource.dir" location="resource"/>
-  
-  <target name="init">
-  	<property file="build.properties" />
-
-	<property name="isfreetype.build.root" location="${build.dir}/isfreetype"/>
-  	<property name="isfreetype.build.dir" location="${isfreetype.build.root}/build"/>
-    <property name="isfreetype.dist.dir"  location="${isfreetype.build.root}/dist"/>  	
-    <property name="isfreetype.javadoc.dir"  location="${isfreetype.build.root}/javadoc"/>
-
-  </target>
-	
-	<target name="make-structure" depends="init">  	
-	    <!-- Create the build directory structure used by compile -->
-	    <mkdir dir="${isfreetype.build.dir}"/>
-	  	<mkdir dir="${isfreetype.dist.dir}"/>
-	    <mkdir dir="${isfreetype.javadoc.dir}"/>
-	</target>
-	
-	<target name="clean" depends="init" description="clean up" >
-	    <!-- Delete the ${dist} directory trees -->
-	    <delete dir="${isfreetype.javadoc.dir}"/>
-	    <delete dir="${isfreetype.dist.dir}"/>
-	    <delete dir="${isfreetype.build.dir}"/>
-	</target>
-	
-  <target name="compile" depends="make-structure" description="isfreetype compile" >
-    <!-- Construct classpath -->
-    <path id="isfreetype.classpath">
-	 	<fileset dir="${libs.dir}">
-	        <include name="**/${isrt.jar.name}.jar"/>
-	        <include name="**/${isnativec.jar.name}.jar"/>
-	        <include name="**/${jna.jar.name}.jar"/>
-	    </fileset>
-    	<pathelement path="${isfreetype.build.dir}"/>
-    </path>
-
-    <!-- Compile the java code -->
-    <javac compiler="javac1.7" target="1.7" source="1.7" srcdir="${isfreetype.src.dir}" destdir="${isfreetype.build.dir}" debug="true" encoding="iso-8859-1">
-    	<classpath refid="isfreetype.classpath"/>
-    </javac>
-  </target>
-	
-  <target name="jar" depends="compile" description="generate the distribution" >
-
-    <jar jarfile="${isfreetype.dist.dir}/${isfreetype.jar.name}.jar" basedir="${isfreetype.build.dir}">
-	    <manifest>
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Main-Class" value=""/>
-		    <attribute name="Class-Path" value="${isrt.jar.name}.jar ${isnativec.jar.name}.jar ${jna.jar.name}.jar"/>
-	    </manifest>
-	    <fileset dir="${isfreetype.resource.dir}">
-        <include name="**/*"/>
-    </fileset>
-    </jar>
-    
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc" depends="make-structure">
-    <javadoc
-      packagenames="de.intarsys.cwt.freetype.*"
-      sourcepath="${isfreetype.src.dir}"
-      destdir="${isfreetype.javadoc.dir}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="freetype API"
-      doctitle="freetype API" >
-    <classpath refid="isfreetype.classpath"/>
-    </javadoc>
-  </target>
-
-
-  
-  <target name="buildZipSrcPackage" depends="javadoc" description="generate build sources zip package" >
-    <zip destfile="${isfreetype.dist.dir}/${isfreetype.jar.name}-build-src.zip">
-		<fileset dir="..">
-	    	<include name="isfreetype/src/**/*"/>
-    	</fileset>
-		<fileset dir="${build.dir}">
-	    	<include name="isfreetype/javadoc/**/*.*"/>
-    	</fileset>
-    	<fileset dir="..">
-    		<include name="isfreetype/ant/**/*.*"/>
-    	</fileset>
-     </zip>
-  </target>
-
-</project>
-
--- a/dev-java/isfreetype/isfreetype-5.5.20120626.ebuild
+++ b/dev-java/isfreetype/isfreetype-5.5.20120626.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a generic native code wrapper."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isFreetype.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	   dev-java/isrt:0
-	   dev-java/isnativec:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-java_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isfreetype/dist/isfreetype.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isfreetype/javadoc
-}
--- a/dev-java/isfreetype/metadata.xml
+++ b/dev-java/isfreetype/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/isnativec/ChangeLog
+++ b/dev-java/isnativec/ChangeLog
@ -1,56 +0,0 @@
-# ChangeLog for dev-java/isnativec
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com>
-  isnativec-5.5.20120626.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com>
-  isnativec-5.5.20120626.ebuild:
-  keyword arm
-
-  13 Aug 2014; Mario Fetka <mario.fetka@gmail.com>
-  isnativec-5.5.20120626.ebuild:
-  downgrade
-
-*isnativec-5.5.20120626 (14 Jul 2014)
-
-  14 Jul 2014; Mario Fetka <mario.fetka@gmail.com>
-  +isnativec-5.5.20120626.ebuild, -isnativec-5.6.20131203.ebuild,
-  files/build.properties, files/build.xml:
-  Downgrade
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> files/build.xml,
-  isnativec-5.6.20131203.ebuild:
-  Update Requ to 1.7 java
-
-*isnativec-5.6.20131203 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com>
-  +isnativec-5.6.20131203.ebuild, -isnativec-5.5.20120626.ebuild:
-  Bump
-
-*isnativec-5.5.20120626 (27 Oct 2012)
-
-  27 Oct 2012; Mario Fetka <mario.fetka@gmail.com>
-  -isnativec-5.3.20100629.ebuild, +isnativec-5.5.20120626.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> files/build.xml:
-  Correct build on utf8 console and cleanup
-
-  27 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
-  +isnativec-5.3.20100629.ebuild:
-  Bump
-
-  27 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-  +isnativec-5.2.20091102.ebuild:
-  Bump to new upstream version
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  isnativec-5.0.20081218.ebuild, files/build.properties, files/build.xml:
-  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> isnativec-5.0.20081218:
-  initial checkin
--- a/dev-java/isnativec/Manifest
+++ b/dev-java/isnativec/Manifest
@ -1,6 +0,0 @@
-AUX build.properties 221 SHA256 30442b5e6d1dda6917453f9c8158dadc69460cb3dc23e7bb6d459d67875bb9e3 SHA512 5d128e489ca804db8624cc30c8123d089ce968176b8ff4cfbc045ec64463cd03c480a95e865212001130baa2fe2c04de3a643797e7764b18b14e05db7ceccdd6 WHIRLPOOL 7a2978e6119c19ef28ddfdb2c6ac40e3c88e9d05af59cd9d52f3ea6cdc3780d446746a9e43db6768c9df3a390a0562d8691abf17a73b55dbcd5df89556df2555
-AUX build.xml 3433 SHA256 49dc414c5c23836bd4c762ad6a81fa508d34de5dd32163f06a7d678e619ce912 SHA512 86a5d63e97a55317a9b5231dd93bcd07905b6b2f820bc47c6eb9c0321202972a4b7c25f0004d4d8ba214a68a7f1084bc2bccd42df2123a6a202b91e96a5fc4da WHIRLPOOL 3e5473a1815f0cdce7964a7235a27ebfc2f616f5336a1a3858df0ed9cf17167b158cc0ccadeaa2e54f18bcf86fbb60ec4e18d667d0196ffe5c6445aa0ca0346c
-DIST isNative.5.5.20120626.zip 1928522 SHA256 00cb1b00de3aeaacacb7073911b07cf2f7ed56202795698342eb864f8469f920 SHA512 46f2b76d865ddaf12361ab9c77bad38e9266f025dde28b3f08bee86e29f1a2eb34b3dbb9367d863e22fa2d1dd7da23113f05f4d32dab37bf2cf5e42676efbdae WHIRLPOOL 97624db7d7097f0408926f4a9d32d64edf85e21d40f5cca57c60dc88dd8d7a91ab03d102ac5332df1fb528fbe163945e3adbaba88763e79355b479b38cea7a35
-EBUILD isnativec-5.5.20120626.ebuild 874 SHA256 025b92382d7f92cf3e81e2d02c3ab8812633b1f341552aa25c8627fb748d3298 SHA512 57c0b3966b60782ddaa47280b598c9e89a37deb1ddf32ad4beb9807745c97b07cb16506ee601831b3be1ccdf354cc3d2de63a8a28214722d499cf9d9a131bbc2 WHIRLPOOL 95459b6efb3c3c0f73f2799f3ff2c76214bbca3dd3b24d493ebcc42ef715a20ab4c8b4317910344ad4ca2a1daff185bc5f3eb313f37ba4afad0aa504708f0153
-MISC ChangeLog 1695 SHA256 1679d409fd3371538610da66b66473913854910c5b3ccc8dc9f82676b5d7e424 SHA512 6cd71ea5d2e07238c4da206f39420dee2664498ce033bcd07983758d63561518628a3becd75d17f61d512caab98cb9ac7e54f914b753270ca715aa859160684d WHIRLPOOL 0279a9f4c0b42fdd3038755160185af4f840283200a9a280b4cc5639ba1b8e0e8696435ce387f5ca7a22a553405984d2d86d4f387f612295e8a4e99f599ea430
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/isnativec/files/build.properties
+++ b/dev-java/isnativec/files/build.properties
@ -1,10 +0,0 @@
-#where classes are compiled, jars distributed, javadocs created and release created
-build.dir=build
-
-#libraries
-libs.dir=.
-isrt.jar.name=isrt
-jna.jar.name=jna
-jna.plattform.jar.name=platform
-isnativec.jar.name=isnativec
-
--- a/dev-java/isnativec/files/build.xml
+++ b/dev-java/isnativec/files/build.xml
@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="isnativec" default="jar" basedir=".">
-    <description>
-        This is a generic native code wrapper
-    </description>
-  
-  <!-- set global properties for this build -->
-  <property name="user.name" value="intarsys consulting GmbH"/>
-  <property name="isnativec.src.dir" location="src"/>
-  <property name="isnativec.resource.dir" location="resource"/>
-  
-  <target name="init">
-  	<property file="build.properties" />
-
-	<property name="isnativec.build.root" location="${build.dir}/isnativec"/>
-  	<property name="isnativec.build.dir" location="${isnativec.build.root}/build"/>
-    <property name="isnativec.dist.dir"  location="${isnativec.build.root}/dist"/>  	
-    <property name="isnativec.javadoc.dir"  location="${isnativec.build.root}/javadoc"/>
-
-  </target>
-	
-	<target name="make-structure" depends="init">  	
-	    <!-- Create the build directory structure used by compile -->
-	    <mkdir dir="${isnativec.build.dir}"/>
-	  	<mkdir dir="${isnativec.dist.dir}"/>
-	    <mkdir dir="${isnativec.javadoc.dir}"/>
-	</target>
-	
-	<target name="clean" depends="init" description="clean up" >
-	    <!-- Delete the ${dist} directory trees -->
-	    <delete dir="${isnativec.javadoc.dir}"/>
-	    <delete dir="${isnativec.dist.dir}"/>
-	    <delete dir="${isnativec.build.dir}"/>
-	</target>
-	
-  <target name="compile" depends="make-structure" description="isnativec compile" >
-    <!-- Construct classpath -->
-    <path id="isnativec.classpath">
-	 	<fileset dir="${libs.dir}">
-	        <include name="**/${isrt.jar.name}.jar"/>
-	        <include name="**/${jna.jar.name}.jar"/>
-	        <include name="**/${jna.platform.jar.name}.jar"/>
-	    </fileset>
-    	<pathelement path="${isnativec.build.dir}"/>
-    </path>
-
-    <!-- Compile the java code -->
-    <javac compiler="javac1.7" target="1.7" source="1.7" srcdir="${isnativec.src.dir}" destdir="${isnativec.build.dir}" debug="true" encoding="iso-8859-1">
-    	<classpath refid="isnativec.classpath"/>
-    </javac>
-  </target>
-	
-  <target name="jar" depends="compile" description="generate the distribution" >
-
-    <jar jarfile="${isnativec.dist.dir}/${isnativec.jar.name}.jar" basedir="${isnativec.build.dir}">
-	    <manifest>
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Main-Class" value=""/>
-		    <attribute name="Class-Path" value="${isrt.jar.name}.jar ${jna.jar.name}.jar"/>
-	    </manifest>
-	    <fileset dir="${isnativec.resource.dir}">
-        <include name="**/*"/>
-    </fileset>
-    </jar>
-    
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc" depends="make-structure">
-    <javadoc
-      packagenames="de.intarsys.nativec.*"
-      sourcepath="${isnativec.src.dir}"
-      destdir="${isnativec.javadoc.dir}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="nativec API"
-      doctitle="nativec API" >
-    <classpath refid="isnativec.classpath"/>
-    </javadoc>
-  </target>
-
-
-  
-  <target name="buildZipSrcPackage" depends="javadoc" description="generate build sources zip package" >
-    <zip destfile="${isnativec.dist.dir}/${isnativec.jar.name}-build-src.zip">
-		<fileset dir="..">
-	    	<include name="isnativec/src/**/*"/>
-    	</fileset>
-		<fileset dir="${build.dir}">
-	    	<include name="isnativec/javadoc/**/*.*"/>
-    	</fileset>
-    	<fileset dir="..">
-    		<include name="isnativec/ant/**/*.*"/>
-    	</fileset>
-     </zip>
-  </target>
-
-</project>
-
--- a/dev-java/isnativec/isnativec-5.5.20120626.ebuild
+++ b/dev-java/isnativec/isnativec-5.5.20120626.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a generic native code wrapper."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isNative.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	   dev-java/isrt:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-java_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isnativec/dist/isnativec.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isnativec/javadoc
-}
--- a/dev-java/isnativec/metadata.xml
+++ b/dev-java/isnativec/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/isrt/ChangeLog
+++ b/dev-java/isrt/ChangeLog
@ -1,49 +0,0 @@
-# ChangeLog for dev-java/isrt
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> isrt-4.10.20120626.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com> isrt-4.10.20120626.ebuild:
-  keyword arm
-
-*isrt-4.10.20120626 (13 Aug 2014)
-
-  13 Aug 2014; Mario Fetka <mario.fetka@gmail.com> +isrt-4.10.20120626.ebuild,
-  -isrt-4.11.20131203.ebuild:
-  downgrade
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> files/build.xml,
-  isrt-4.11.20131203.ebuild:
-  Update Requ to 1.7 java
-
-*isrt-4.11.20131203 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> +isrt-4.11.20131203.ebuild,
-  -isrt-4.10.20120626.ebuild:
-  Bump
-
-*isrt-4.10.20120626 (27 Oct 2012)
-
-  27 Oct 2012; Mario Fetka <mario.fetka@gmail.com> -isrt-4.8.20100629.ebuild,
-  +isrt-4.10.20120626.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> files/build.xml:
-  Correct build on utf8 console and cleanup
-
-  27 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
-  +isrt-4.8.20100629.ebuild:
-  Bump
-
-  27 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-  +isrt-4.7.20091102.ebuild:
-  Bump to new upstream version
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com> isrt-4.5.20081218.ebuild,
-  files/build.properties, files/build.xml:
-  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> Manifest:
-  initial checkin
--- a/dev-java/isrt/Manifest
+++ b/dev-java/isrt/Manifest
@ -1,6 +0,0 @@
-AUX build.properties 143 SHA256 70d4acc51b2208c7422177e0ea960f9a13a38280d6798049e37ea2591dc15126 SHA512 897c60e291b6577b02bc56e07a6c59c6ea7a1cf41f94cd1357ff435ee882924f8b8251dee90d20a5396098d4717d311fa891a8981c13e7d1797d33eec478772a WHIRLPOOL 8778c661a1808312e3f38db1802d662939d4bdf2a6fe4dc69fa553948f4aa6d9e3763863215d0d90df34c8ac6571e68335580b845d204da38ae3d37618386a04
-AUX build.xml 3087 SHA256 f0a73774ee975211928a577da017dc522bf2ecad6f086f9dd5b8b0880be2d374 SHA512 dafe5cd30f3c8fcf0d1034c0c0cc3f44beed9a0e13dd01a72927b3e2a959a22f60becfe7e6446527a86283357092f3b1371c7b9cc8f0ae6dfef52ec339fc5f4a WHIRLPOOL ce650b32edd1ee6fb914ad39c4203ee73d47e3ade609b0eb654871bc23d7e0e6a17e3cd893418f09b0d96812a3d4031e7a0f62977c75e09ba129b2af3b91bafb
-DIST isrt.4.10.20120626.zip 5722258 SHA256 fa0287a35395700b9b27d0588df2d2961391b9abaa0fb4f08db792fd628f3bde SHA512 a5c2c4fe0fc744963b6deeab8e9b1d9e90c053ac4f801ec718a505e2f9445dcf6abfd90eb92eb8f242c5dfa87274ccaef8d0f214dfae710b2b3d519421a17720 WHIRLPOOL eca374c65a8f94a9be1233ea9c383411c01b0032ba5f31be6d7a1bf0a40bae282d4e1c0c5697cd7a82d00a13a3c0a87bdfe5acb6d155618984ac743abb21f83e
-EBUILD isrt-4.10.20120626.ebuild 745 SHA256 9db6043732b1d28fef5b75a2bb92e84cfe56f8e7d85c5abb7978353f2fe637a8 SHA512 035c44580db49d38f55684d5ae6c0203f1dade8c77ab33444a937e43db509ed735c97e59da822c7eb3bfc4517e2c96a656ff27e9110913bf23db9a6a3d7b00ac WHIRLPOOL 73a940a58c6daa8e6f7292c85c30c04ce802fa94b62c1a5d2a826eeb0f33c94af80228eec72e3d0a4a0fcef81cfc13df00831b99e64fadcac7ba35dcd14caec5
-MISC ChangeLog 1468 SHA256 8b9469c55bc20fdaf1a1012429eda9b634f442eeb832f3ba8e074238ba8f1c02 SHA512 07bd62ec69783172f52fd9908527f2807a124fc21535727a56674d6a4fb7dd42db2c5016a90c258f2061ed406022b4d6177557aa24914abf9e806c009b7c3e74 WHIRLPOOL 245ecc06106454054a962983f79ce1c5ac96978ba21a75ba879cd7f791af9b1fddd2bfea192272b702f076b95c2538366d26f774ef5aa8ce6bcb11efe09c071c
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/isrt/files/build.properties
+++ b/dev-java/isrt/files/build.properties
@ -1,7 +0,0 @@
-#where classes are compiled, jars distributed, javadocs created and release created
-build.dir=build
-
-#libraries
-libs.dir=.
-isrt.jar.name=isrt
-
--- a/dev-java/isrt/files/build.xml
+++ b/dev-java/isrt/files/build.xml
@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="isrt" default="jar" basedir=".">
-    <description>
-        The basic runtime tools and interfaces for intarsys components
-    </description>
-  
-  <!-- set global properties for this build -->
-  <property name="user.name" value="intarsys consulting GmbH"/>
-  <property name="isrt.src.dir" location="src"/>
-  
-  <target name="init">
-  	<property file="build.properties" />
-
-	<property name="isrt.build.root" location="${build.dir}/isrt"/>
-  	<property name="isrt.build.dir" location="${isrt.build.root}/build"/>
-    <property name="isrt.dist.dir"  location="${isrt.build.root}/dist"/>  	
-    <property name="isrt.javadoc.dir"  location="${isrt.build.root}/javadoc"/>
-
-  </target>
-	
-	<target name="make-structure" depends="init">  	
-	    <!-- Create the build directory structure used by compile -->
-	    <mkdir dir="${isrt.build.dir}"/>
-	  	<mkdir dir="${isrt.dist.dir}"/>
-	    <mkdir dir="${isrt.javadoc.dir}"/>
-	</target>
-	
-	<target name="clean" depends="init" description="clean up" >
-	    <!-- Delete the ${dist} directory trees -->
-	    <delete dir="${isrt.javadoc.dir}"/>
-	    <delete dir="${isrt.dist.dir}"/>
-	    <delete dir="${isrt.build.dir}"/>
-	</target>
-	
-  <target name="compile" depends="make-structure" description="isrt compile" >
-    <!-- Construct classpath -->
-    <path id="isrt.classpath">
-<!--	 	<fileset dir="${libs.dir}">
-	        <include name="**/${isrt.jar.name}.jar"/>
-	        <include name="**/${jna.jar.name}.jar"/>
-	    </fileset> -->
-    	<pathelement path="${isrt.build.dir}"/>
-    </path>
-
-    <!-- Compile the java code -->
-    <javac compiler="javac1.7" target="1.7" source="1.7" srcdir="${isrt.src.dir}" destdir="${isrt.build.dir}" debug="true" encoding="iso-8859-1">
-    	<classpath refid="isrt.classpath"/>
-    </javac>
-  </target>
-	
-  <target name="jar" depends="compile" description="generate the distribution" >
-
-    <jar jarfile="${isrt.dist.dir}/${isrt.jar.name}.jar" basedir="${isrt.build.dir}">
-	    <manifest>
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Main-Class" value=""/>
-	<!--	    <attribute name="Class-Path" value="${isrt.jar.name}.jar ${jna.jar.name}.jar"/> -->
-	    </manifest>
-    </jar>
-    
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc" depends="make-structure">
-    <javadoc
-      packagenames="de.intarsys.tools.*"
-      sourcepath="${isrt.src.dir}"
-      destdir="${isrt.javadoc.dir}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="tools API"
-      doctitle="tools API" >
-    <classpath refid="isrt.classpath"/>
-    </javadoc>
-  </target>
-
-
-  
-  <target name="buildZipSrcPackage" depends="javadoc" description="generate build sources zip package" >
-    <zip destfile="${isrt.dist.dir}/${isrt.jar.name}-build-src.zip">
-		<fileset dir="..">
-	    	<include name="isrt/src/**/*"/>
-    	</fileset>
-		<fileset dir="${build.dir}">
-	    	<include name="isrt/javadoc/**/*.*"/>
-    	</fileset>
-    	<fileset dir="..">
-    		<include name="isrt/ant/**/*.*"/>
-    	</fileset>
-     </zip>
-  </target>
-
-</project>
-
--- a/dev-java/isrt/isrt-4.10.20120626.ebuild
+++ b/dev-java/isrt/isrt-4.10.20120626.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The basic runtime tools and interfaces for intarsys components."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isrt.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-java_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isrt/dist/isrt.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isrt/javadoc
-}
--- a/dev-java/isrt/metadata.xml
+++ b/dev-java/isrt/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/jPod/ChangeLog
+++ b/dev-java/jPod/ChangeLog
@ -1,52 +0,0 @@
-# ChangeLog for dev-java/jPod
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> jPod-5.5.20120626.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com> jPod-5.5.20120626.ebuild:
-  keyword arm
-
-*jPod-5.5.20120626 (13 Aug 2014)
-
-  13 Aug 2014; Mario Fetka <mario.fetka@gmail.com> +jPod-5.5.20120626.ebuild,
-  -jPod-5.6.20131203.ebuild:
-  downgrade
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> files/build.xml,
-  jPod-5.6.20131203.ebuild:
-  Update Requ to 1.7 java
-
-*jPod-5.6.20131203 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> +jPod-5.6.20131203.ebuild,
-  -jPod-5.5.20120626.ebuild:
-  Bump
-
-*jPod-5.5.20120626 (27 Oct 2012)
-
-  27 Oct 2012; Mario Fetka <mario.fetka@gmail.com> -jPod-5.3.20100629.ebuild,
-  +jPod-5.5.20120626.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> files/build.xml:
-  Correct build on utf8 console and cleanup
-
-  27 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
-  +jPod-5.3.20100629.ebuild:
-  Bump
-
-  27 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-  +jPod-5.2.20091102.ebuild:
-  Bump to new upstream version
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com> jPod-5.0.20081218.ebuild:
-  correct USE
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com> jPod-5.0.20081218.ebuild,
-  files/build.properties, files/build.xml:
-  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
-  initial checkin
--- a/dev-java/jPod/Manifest
+++ b/dev-java/jPod/Manifest
@ -1,6 +0,0 @@
-AUX build.properties 204 SHA256 e0a4f9512ae340db22a12956f98ed420c3b142987a421b0b959cf6ed3e336e24 SHA512 a8e532312305e2ed730278038335217f1ff4860c9c2ff1993cc231f147695094cb280d29723f5c6f214e09c75296c7baa699bd5997a5dcd2bc9cd4171b6e1d53 WHIRLPOOL 5abfe86d559031923c2e2381f4f196522e4fb6804749444f3ee7f25540ec8dd020506a7f60e9a0b0a2b6b10d7e3f88a67aebd5e5e1fe7a12885173b994f21b35
-AUX build.xml 3292 SHA256 8d29b954739f0821b530984b8c2dc6314080add3a3892d9cdb55160525d2d3a7 SHA512 ebe51a5e013563286b3635e35ac167ecc96ea1cb7c9dca04011712f5767063141ae5cc92258206ad96d6175ccc4396e728045582d5d406f9f3bc62612f8d185e WHIRLPOOL 02cd14a6bf952592af2a8da36a73b49d94ed67c67165826cca9e0df928b67eb9279643c5ef80b83abe344ca112d826367c483d309965e543fbef173bba49f458
-DIST jPod.5.5.20120626.zip 6502636 SHA256 6f0305df0392f92a9a700e3d4f6cfd9019e4fce9d1cbe2d4a9af1ec289a9a113 SHA512 1c248ca1689e8fb726d860de43bef4cfefe10f2a5b3315e6d457695d2e77224eec5ae5988f84c747e0f035ec5028df2282029655e3e29b76533f33249274b3a6 WHIRLPOOL 2fd2ddf0a61f0e75d840f55427c76290187f75370c7ce0d4a9dcd85bed1b031b35c24f8e9388facad9a30b84c7ae5f1be2bbd29dc454d029673ff42bfbf88f9b
-EBUILD jPod-5.5.20120626.ebuild 908 SHA256 3be142dbf141cedf58a4c2f95531d379b95fa1dca35ea529b10530f360ed7157 SHA512 5d6864969af9abf5718547321b24cd23d59cbdcaee13e2391108ecb9aafd3bb7dea02dc3fef0d9110e5d29276cfe201c70757d4a63c28a7c6247e367aec9db6c WHIRLPOOL 0fd1f7d86a6e4a4edafe19e2fa3938cc28f27562b19c2924dfc41fa254aef1cd04c5d242c4811b0120adb4e52a806513e1ac27af57f689156ede5fde03392510
-MISC ChangeLog 1550 SHA256 ccb114be6bc76872e49ad68b3f85670b977a063cd20b6a20f7fec45b88fabbe8 SHA512 de1c52206b862c3c23258d5b521224f11f124c2d01b29cc79491cc4ea4de069c3630062cb2bc8094de80be916af21cd17c9ded3a6169d6e521e815e7bd967537 WHIRLPOOL b181e266c78358061ef81b7e364bd422610ed7fd7cde3ff3ca4b308961f481a182684133f2159743804d34ac720172f2e1cd57fcb718446ed8a7d91a04738a24
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/jPod/files/build.properties
+++ b/dev-java/jPod/files/build.properties
@ -1,10 +0,0 @@
-#where classes are compiled, jars distributed, javadocs created and release created
-build.dir=build
-
-#libraries
-libs.dir=.
-jbig2.jar.name=jbig2
-isrt.jar.name=isrt
-iscwt.jar.name=iscwt
-jPod.jar.name=jPod
-
--- a/dev-java/jPod/files/build.xml
+++ b/dev-java/jPod/files/build.xml
@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="jPod" default="jar" basedir=".">
-    <description>
-        This is a window toolkit and basic rendering abstraction layer
-    </description>
-  
-  <!-- set global properties for this build -->
-  <property name="user.name" value="intarsys consulting GmbH"/>
-  <property name="jPod.src.dir" location="src"/>
-  <property name="jPod.resource.dir" location="resource"/>
-  
-  <target name="init">
-  	<property file="build.properties" />
-
-	<property name="jPod.build.root" location="${build.dir}/jPod"/>
-  	<property name="jPod.build.dir" location="${jPod.build.root}/build"/>
-    <property name="jPod.dist.dir"  location="${jPod.build.root}/dist"/>  	
-    <property name="jPod.javadoc.dir"  location="${jPod.build.root}/javadoc"/>
-
-  </target>
-	
-	<target name="make-structure" depends="init">  	
-	    <!-- Create the build directory structure used by compile -->
-	    <mkdir dir="${jPod.build.dir}"/>
-	  	<mkdir dir="${jPod.dist.dir}"/>
-	    <mkdir dir="${jPod.javadoc.dir}"/>
-	</target>
-	
-	<target name="clean" depends="init" description="clean up" >
-	    <!-- Delete the ${dist} directory trees -->
-	    <delete dir="${jPod.javadoc.dir}"/>
-	    <delete dir="${jPod.dist.dir}"/>
-	    <delete dir="${jPod.build.dir}"/>
-	</target>
-	
-  <target name="compile" depends="make-structure" description="jPod compile" >
-    <!-- Construct classpath -->
-    <path id="jPod.classpath">
-	 	<fileset dir="${libs.dir}">
-	        <include name="**/${isrt.jar.name}.jar"/>
-	        <include name="**/${iscwt.jar.name}.jar"/>
-	        <include name="**/${jbig2.jar.name}.jar"/>
-	    </fileset>
-    	<pathelement path="${jPod.build.dir}"/>
-    </path>
-
-    <!-- Compile the java code -->
-    <javac compiler="javac1.7" target="1.7" source="1.7" srcdir="${jPod.src.dir}" destdir="${jPod.build.dir}" debug="true" encoding="iso-8859-1">
-    	<classpath refid="jPod.classpath"/>
-    </javac>
-  </target>
-	
-  <target name="jar" depends="compile" description="generate the distribution" >
-
-    <jar jarfile="${jPod.dist.dir}/${jPod.jar.name}.jar" basedir="${jPod.build.dir}">
-	    <manifest>
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Main-Class" value=""/>
-		    <attribute name="Class-Path" value="${isrt.jar.name}.jar ${iscwt.jar.name}.jar ${jbig2.jar.name}.jar"/>
-	    </manifest>
-	    <fileset dir="${jPod.resource.dir}">
-        <include name="**/*"/>
-    </fileset>
-    </jar>
-    
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc" depends="make-structure">
-    <javadoc
-      packagenames="de.intarsys.pdf.*"
-      sourcepath="${jPod.src.dir}"
-      destdir="${jPod.javadoc.dir}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="jPod API"
-      doctitle="jPod API" >
-    <classpath refid="jPod.classpath"/>
-    </javadoc>
-  </target>
-
-
-  
-  <target name="buildZipSrcPackage" depends="javadoc" description="generate build sources zip package" >
-    <zip destfile="${jPod.dist.dir}/${jPod.jar.name}-build-src.zip">
-		<fileset dir="..">
-	    	<include name="jPod/src/**/*"/>
-    	</fileset>
-		<fileset dir="${build.dir}">
-	    	<include name="jPod/javadoc/**/*.*"/>
-    	</fileset>
-    	<fileset dir="..">
-    		<include name="jPod/ant/**/*.*"/>
-    	</fileset>
-     </zip>
-  </target>
-
-</project>
-
--- a/dev-java/jPod/jPod-5.5.20120626.ebuild
+++ b/dev-java/jPod/jPod-5.5.20120626.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jbig2,iscwt,isrt"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library for reading, writing and manipulating PDF files."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/jPod.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/isrt:0
-	    dev-java/jbig2:0
-	    dev-java/iscwt:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-java_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jPod/dist/jPod.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jPod/javadoc
-}
--- a/dev-java/jPod/metadata.xml
+++ b/dev-java/jPod/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/jPodRenderer/ChangeLog
+++ b/dev-java/jPodRenderer/ChangeLog
@ -1,66 +0,0 @@
-# ChangeLog for dev-java/jPodRenderer
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  08 Aug 2015; Mario Fetka <mario.fetka@gmail.com>
-  jPodRenderer-5.5.1.20120711.ebuild:
-  use old swt
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com>
-  jPodRenderer-5.5.1.20120711.ebuild:
-  Bump swt
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com>
-  jPodRenderer-5.5.1.20120711.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com>
-  jPodRenderer-5.5.1.20120711.ebuild:
-  keyword arm
-
-*jPodRenderer-5.5.1.20120711 (13 Aug 2014)
-
-  13 Aug 2014; Mario Fetka <mario.fetka@gmail.com>
-  +jPodRenderer-5.5.1.20120711.ebuild, -jPodRenderer-5.6.20131203.ebuild:
-  downgrade
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> files/build.xml,
-  jPodRenderer-5.6.20131203.ebuild:
-  Update Requ to 1.7 java
-
-*jPodRenderer-5.6.20131203 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com>
-  +jPodRenderer-5.6.20131203.ebuild, -jPodRenderer-5.5.1.20120711.ebuild:
-  Bump
-
-*jPodRenderer-5.5.1.20120711 (27 Oct 2012)
-
-  27 Oct 2012; Mario Fetka <mario.fetka@gmail.com>
-  -jPodRenderer-5.3.20100629.ebuild, +jPodRenderer-5.5.1.20120711.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> files/build.xml:
-  Correct build on utf8 console and cleanup
-
-  27 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
-  +jPodRenderer-5.3.20100629.ebuild:
-  Bump
-
-  27 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-  +jPodRenderer-5.2.10091102.ebuild:
-  Bump to new upstream version
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com> files/build.xml:
-  correct typo
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  jPodRenderer-5.0.20081218.ebuild:
-  correct USE
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  jPodRenderer-5.0.20081218.ebuild, files/build.properties, files/build.xml:
-  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
-  initial checkin
--- a/dev-java/jPodRenderer/Manifest
+++ b/dev-java/jPodRenderer/Manifest
@ -1,6 +0,0 @@
-AUX build.properties 422 SHA256 5a9f9e85a55861eb8f441d74122003e3cf326d74ef2cd60469d93133c7601d04 SHA512 5bd811b092b4a979bb2766dbf46271088655bb7fdb2fe3111fb1d239f7e66f78f3e759dfad300d7a5444b7602fe8dc73064120d36158bfba942eafc15413e597 WHIRLPOOL 6a9437825e17ee108d8a483f32f276cc1110efc2cda975dd04d49bb6d3345148cc99db3ee7a4bda30edae5cdd5cbb156ca96eefc9896c63d05736e153b4b16c0
-AUX build.xml 4223 SHA256 9673e8ef554792ec70af010421e954d140a697929490f7de1973de99379aa4ea SHA512 56b7888c7073949c189be0d4ac25bcf3cfefe7103c99f1f38926ff747b343d48155088b68febce9eb7715ecbd2852fcf38c267633fdce70618e077ec9180ef60 WHIRLPOOL ab2a4f99d29f1c5a7dda1e5a7161822fe32842cba2e4d10eac2fb6fe53543d3f7d472fa2a6adc57bb389b4b459e98b8e1c8875f46e96a0ef0fddff7aea1a118a
-DIST jPodRenderer.5.5.1.20120711.zip 9661481 SHA256 d449462bea32d4e36bc4dcf13acb6aef46b721f18fb419a939225fba54ec5551 SHA512 3490f57685d46558627e281cf4f15acc4665118e8aced46f8abc1ea99937a8d245fcda037789501fea7621fbc25bbca54a6ad8e5c17e1b7387303561adadbfb3 WHIRLPOOL 1b0483f854597fa11010c756140bb4e5fe2193229dc3e8c7cac71e1944876cd0cff8e9f178091d4fbb6c87bf7ae10a978f9f21f13178af9932d289deb07272d6
-EBUILD jPodRenderer-5.5.1.20120711.ebuild 1206 SHA256 d9435ec2e63a97fe9c7554645006258828de89fc025238ebb8e94912c2d5a7fa SHA512 773d2aad1515e57e2dca30b40694cfe88a88f5ed8a11392bd4d7ea935b70bbc7553e921ab8d9e619e80a483c0d7354402a9e2fa98d847ed80662de4995dfdf8c WHIRLPOOL eb44324ccfda4df34b35f538de0315b4d6c88ef858f4bdabe6d5925d9efdc58fac758a52545d2e4eae3dc41dfc0d643cfbceffe1718c67f810ed4a39e57ae60f
-MISC ChangeLog 1995 SHA256 dc2ba2ae4204db939edf6a1f4bf2582ab701219049841327d004898de042b8c8 SHA512 81bf1772f948b1ac54a9d95371e9ba846f7e74ce516f7a0366f33a7bc9f03a05abb349fe6e5de71b58b77be0af307e71ee71fe79e1e45340671934c14e598450 WHIRLPOOL 2b1d6081f323882a4ac739aa12e09d3ea642124e32310622d4e8d2799126a63f945d75cc0a4b3fb88d2f5b98fb383259ada591f00697e5c1f4cb73d3dbd0a46d
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/jPodRenderer/files/build.properties
+++ b/dev-java/jPodRenderer/files/build.properties
@ -1,18 +0,0 @@
-#where classes are compiled, jars distributed, javadocs created and release created
-build.dir=build
-
-#libraries
-libs.dir=.
-jai_codec.jar.name=jai_codec
-jai_core.jar.name=jai_core
-jai_imageio.jar.name=jai_imageio
-jbig2.jar.name=jbig2
-jna.jar.name=jna
-swt.jar.name=swt
-isrt.jar.name=isrt
-isnativec.jar.name=isnativec
-isfreetype.jar.name=isfreetype
-iscwt.jar.name=iscwt
-jPod.jar.name=jPod
-jPodRenderer.jar.name=jPodRenderer
-
--- a/dev-java/jPodRenderer/files/build.xml
+++ b/dev-java/jPodRenderer/files/build.xml
@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="jPodRenderer" default="jar" basedir=".">
-    <description>
-        This is a window toolkit and basic rendering abstraction layer
-    </description>
-  
-  <!-- set global properties for this build -->
-  <property name="user.name" value="intarsys consulting GmbH"/>
-  <property name="jPodRenderer.src.dir" location="src"/>
-  <property name="jPodRenderer.resource.dir" location="resource"/>
-  
-  <target name="init">
-  	<property file="build.properties" />
-
-	<property name="jPodRenderer.build.root" location="${build.dir}/jPodRenderer"/>
-  	<property name="jPodRenderer.build.dir" location="${jPodRenderer.build.root}/build"/>
-    <property name="jPodRenderer.dist.dir"  location="${jPodRenderer.build.root}/dist"/>  	
-    <property name="jPodRenderer.javadoc.dir"  location="${jPodRenderer.build.root}/javadoc"/>
-
-  </target>
-	
-	<target name="make-structure" depends="init">  	
-	    <!-- Create the build directory structure used by compile -->
-	    <mkdir dir="${jPodRenderer.build.dir}"/>
-	  	<mkdir dir="${jPodRenderer.dist.dir}"/>
-	    <mkdir dir="${jPodRenderer.javadoc.dir}"/>
-	</target>
-	
-	<target name="clean" depends="init" description="clean up" >
-	    <!-- Delete the ${dist} directory trees -->
-	    <delete dir="${jPodRenderer.javadoc.dir}"/>
-	    <delete dir="${jPodRenderer.dist.dir}"/>
-	    <delete dir="${jPodRenderer.build.dir}"/>
-	</target>
-	
-  <target name="compile" depends="make-structure" description="jPodRenderer compile" >
-    <!-- Construct classpath -->
-    <path id="jPodRenderer.classpath">
-	 	<fileset dir="${libs.dir}">
-	        <include name="**/${isrt.jar.name}.jar"/>
-	        <include name="**/${isnativec.jar.name}.jar"/>
-	        <include name="**/${isfreetype.jar.name}.jar"/>
-	        <include name="**/${iscwt.jar.name}.jar"/>
-	        <include name="**/${jPod.jar.name}.jar"/>
-	        <include name="**/${jbig2.jar.name}.jar"/>
-	        <include name="**/${jna.jar.name}.jar"/>
-	        <include name="**/${swt.jar.name}.jar"/>
-	        <include name="**/${jai_codec.jar.name}.jar"/>
-	        <include name="**/${jai_core.jar.name}.jar"/>
-	        <include name="**/${jai_imageio.jar.name}.jar"/>
-	    </fileset>
-    	<pathelement path="${jPodRenderer.build.dir}"/>
-    </path>
-
-    <!-- Compile the java code -->
-    <javac compiler="javac1.7" target="1.7" source="1.7" srcdir="${jPodRenderer.src.dir}" destdir="${jPodRenderer.build.dir}" debug="true" encoding="iso-8859-1">
-    	<classpath refid="jPodRenderer.classpath"/>
-    </javac>
-  </target>
-	
-  <target name="jar" depends="compile" description="generate the distribution" >
-
-    <jar jarfile="${jPodRenderer.dist.dir}/${jPodRenderer.jar.name}.jar" basedir="${jPodRenderer.build.dir}">
-	    <manifest>
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Main-Class" value=""/>
-		    <attribute name="Class-Path" value="${isrt.jar.name}.jar ${isnativec.jar.name}.jar ${isfreetype.jar.name}.jar ${iscwt.jar.name}.jar ${jPod.jar.name}.jar ${jbig2.jar.name}.jar ${jna.jar.name}.jar ${swt.jar.name}.jar ${jai_codec.jar.name}.jar ${jai_core.jar.name}.jar ${jai_imageio.jar.name}.jar"/>
-	    </manifest>
-	    <fileset dir="${jPodRenderer.resource.dir}">
-        <include name="**/*"/>
-    </fileset>
-    </jar>
-    
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc" depends="make-structure">
-    <javadoc
-      packagenames="de.intarsys.pdf.platform.*"
-      sourcepath="${jPodRenderer.src.dir}"
-      destdir="${jPodRenderer.javadoc.dir}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="jPodRenderer API"
-      doctitle="jPodRenderer API" >
-    <classpath refid="jPodRenderer.classpath"/>
-    </javadoc>
-  </target>
-
-
-  
-  <target name="buildZipSrcPackage" depends="javadoc" description="generate build sources zip package" >
-    <zip destfile="${jPodRenderer.dist.dir}/${jPodRenderer.jar.name}-build-src.zip">
-		<fileset dir="..">
-	    	<include name="jPodRenderer/src/**/*"/>
-    	</fileset>
-		<fileset dir="${build.dir}">
-	    	<include name="jPodRenderer/javadoc/**/*.*"/>
-    	</fileset>
-    	<fileset dir="..">
-    		<include name="jPodRenderer/ant/**/*.*"/>
-    	</fileset>
-     </zip>
-  </target>
-
-</project>
-
--- a/dev-java/jPodRenderer/jPodRenderer-5.5.1.20120711.ebuild
+++ b/dev-java/jPodRenderer/jPodRenderer-5.5.1.20120711.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jai-imageio,sun-jai-bin,jbig2,swt-3.4,jPod,iscwt,isfreetype,isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is the jPod based PDF platform & rendering library."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/jPodRenderer.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jai-imageio:0
-	    dev-java/sun-jai-bin:0
-	    dev-java/jbig2:0
-	    dev-java/jna:0
-	    dev-java/swt:3.4
-	    dev-java/isrt:0
-	    dev-java/isnativec:0
-	    dev-java/isfreetype:0
-	    dev-java/iscwt:0
-	    dev-java/jPod:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-java_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jPodRenderer/dist/jPodRenderer.jar
-	java-pkg_dojar lib/jPodFonts.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jPodRenderer/javadoc
-}
--- a/dev-java/jPodRenderer/metadata.xml
+++ b/dev-java/jPodRenderer/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/jai-imageio/ChangeLog
+++ b/dev-java/jai-imageio/ChangeLog
@ -1,17 +0,0 @@
-# ChangeLog for dev-java/jai-imageio
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> jai-imageio-1.1-r1.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com> jai-imageio-1.1-r1.ebuild:
-  keyword arm
-
-*jai-imageio-1.1 (22 Dec 2009)
-
-  22 Dec 2009; James Le Cuirot <chewi@aura-online.co.uk>
-  +jai-imageio-1.1.ebuild:
-  New package. Needed by Audiveris, which I will add soon. Unfortunately the
-  source is only available from CVS and the codec library is closed source.
-  At least this ebuild is much nicer than the one in bug #252249. :)
--- a/dev-java/jai-imageio/Manifest
+++ b/dev-java/jai-imageio/Manifest
@ -1,3 +0,0 @@
-EBUILD jai-imageio-1.1-r1.ebuild 972 SHA256 a834a8661666c2aaf8486474f83d04e5244ca4119d16df6d7961dd97612745c7 SHA512 d7eeec9173956cdedb3f908f444f9a08a1b27c545d4587251447684a84f4070e8b3798597ac45bc5174724ac597a6be91895ca65aad09e4edb9d1de46514400b WHIRLPOOL 73c53ce9047c199df7683a044aa741e43029ec027cbfe0c75be3857a5195a0f4f644cd1ae273e4806a04d61b74582eea6d49b752217691ef1b9f72539fc5ae93
-MISC ChangeLog 647 SHA256 2edac2c41bb6a2704cfaf5500c785c41fd27c61aa5794e24dfce43c5fa5fe443 SHA512 2141babb62706ca0d864f38828f4466a5143fc5bfb84c87c1f098ee89d7b56e5cfa111ce79b5c047cb7a0780247c6794d0a0e8b387026d4f82b29c2213424029 WHIRLPOOL 8693e6ad5dfe6b66ed539704c2c634bdd18fd9b752c6af5a041e6ac782190a578ec88780d5b29fc6d1cf67e194193ed5213e68a061c0e4e051014767a40492cb
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
--- a/dev-java/jai-imageio/jai-imageio-1.1-r1.ebuild
+++ b/dev-java/jai-imageio/jai-imageio-1.1-r1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 subversion
-
-ESVN_REPO_URI="https://svn.java.net/svn/jai-imageio-core~svn/tags/jai-imageio-1_1-fcs"
-
-DESCRIPTION="A library for managing images based on JAI"
-HOMEPAGE="http://java.net/projects/jai-imageio-core/"
-LICENSE="jai-imageio sun-bcla-jclib4jai"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-CDEPEND="dev-java/sun-jai-bin"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.4"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.4"
-
-S="${WORKDIR}/${PN}-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="sun-jai-bin"
-EANT_GENTOO_CLASSPATH_EXTRA="src/share/jclib4jai/clibwrapper_jiio.jar"
-
-src_install() {
-	dohtml www/index.html || die
-	use source && java-pkg_dosrc src/share/classes/*
-
-	cd build/*/opt/lib || die
-	java-pkg_dojar ext/clibwrapper_jiio.jar ext/jai_imageio.jar
-	java-pkg_doso */libclib_jiio.so
-}
--- a/dev-java/jai-imageio/metadata.xml
+++ b/dev-java/jai-imageio/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
--- a/dev-java/jbig2/ChangeLog
+++ b/dev-java/jbig2/ChangeLog
@ -1,38 +0,0 @@
-# ChangeLog for dev-java/jbig2
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> jbig2-1.4.ebuild:
-  Stable on arm
-
-  22 Jul 2015; Mario Fetka <mario.fetka@gmail.com> jbig2-1.4.ebuild:
-  keyword arm
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> files/build.xml,
-  jbig2-1.4.ebuild:
-  Update Requ to 1.7 java
-
-*jbig2-1.4 (23 Jun 2014)
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> +jbig2-1.4.ebuild,
-  -jbig2-20111119.ebuild:
-  Bump
-
-  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> jbig2-20111119.ebuild:
-  Correct build on utf8 console and cleanup
-
-  27 Aug 2010; Mario Fetka <mario.fetka@gmail.com> +jbig2-20100827.ebuild:
-  Bump
-
-  09 May 2010; Mario Fetka <mario.fetka@gmail.com> +jbig2-20100509.ebuild:
-  Bump
-
-  07 Dec 2009; Mario Fetka <mario.fetka@gmail.com> +jbig2-20091207.ebuild:
-  Bump
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com> jbig2-20090114.ebuild,
-  files/build.properties, files/build.xml:
-  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
-  initial checkin
--- a/dev-java/jbig2/Manifest
+++ b/dev-java/jbig2/Manifest
@ -1,6 +0,0 @@
-AUX build.properties 145 SHA256 12e0e7dc74c08c404cfc0344742f2ddb78d91a4f7c9ba44aef0599d5c5aed289 SHA512 a04adc68df8140d3d37b81d4c170ffbad067ccda2bd6841d43e7fc91d21aaf439720bcec055fe8d936dad678ecd1b308ff72783aecdc9268a6c5b79a62a0ca75 WHIRLPOOL 10f055a99f4ad38d4a9b43fd648b479bce183ed22781d03bef19a864ddf173468872c6dfb649f4e1e3c0a81d84800b703746f50f663c9d25c7ad0c35cad8051f
-AUX build.xml 3128 SHA256 1adba8a98ad76ca07ce396b89ef7357f7dc7892de823009bbd8249911584a55f SHA512 9a2f396a2db9775aac00659de76bfce7b9ff4167b77f4c3992cb6ef07bf4fe11094cd09512cbb585bb747c2126f3f7de43b479b2ab0faacfb5b8b13409849d92 WHIRLPOOL 12141ca33fd0fde5568b64b21b1a4c5e9714c06fc02ae4ba2af28cc60000f037cd8397437ab66bcd94b1ec06cadb06f11d3215fe8e196a83940ede72f2a5c09d
-DIST jbig2_src_1.4.zip 113638 SHA256 c3b6b132afaf1374a41bbe5931ddcb9c0bcab9b0f2d2abe1cfb567c70c1a3ee5 SHA512 2e9d5af09d332540681ed39a6875436183ca0328c7cd690db35d6869e11c632f236db65ff3055fe86a70a0f0d2393f3f99cbd261f3e5b69c9b55f1523cae53e4 WHIRLPOOL 677299fb73c51c55302aa2da55a85fa8b53365a89392da2b32136f8171d21d2df94e41afc45f8bbc5d426755b49f121cde07c14f25fc423b21a8e3765b0e5b80
-EBUILD jbig2-1.4.ebuild 770 SHA256 c7f87b082661eb7ffe53bdaafb42c5d82375a67cbb9767f83498c91bff61066c SHA512 97d65f747838717321af1780e2cff0a781e6276018c9634181dae79fabe8cd2c819caa99f7bf330cc28d31d2bdf97870753940111c72a1b64e5b848a3ef07520 WHIRLPOOL 8c010211b829108a26e7ce350de81c33b2276b4170380df0b18c852e60414997f20e13c703b990907e0eb1c13518f164f86a35f6ba1d1c863d81f457cded7504
-MISC ChangeLog 1165 SHA256 47b01ee35536b6e4f5cc612ebe6ccffe625c7efcab672068da0bf6db16c97297 SHA512 1e695d80a4e8c21253a7e8a8e45f98b60b1fb2bfe10343b8c21c0a2572cabaa1e6c55e60acef0e74fd53a4ac2cca96892a93953376cf76131e3516762666faae WHIRLPOOL ca1191dc5647beea98c4f03e52a7a6f63128ac337cdae5d7ac42c381a2b6de327b73033c009324adb58648ddc89d856ecf853510e4df739048209115393daa3e
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/jbig2/files/build.properties
+++ b/dev-java/jbig2/files/build.properties
@ -1,7 +0,0 @@
-#where classes are compiled, jars distributed, javadocs created and release created
-build.dir=build
-
-#libraries
-libs.dir=.
-jbig2.jar.name=jbig2
-
--- a/dev-java/jbig2/files/build.xml
+++ b/dev-java/jbig2/files/build.xml
@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="jbig2" default="jar" basedir=".">
-    <description>
-        The JPedal JBIG2 Image Decoder is a 100% pure Java image decoder for the JBIG2 file format.
-    </description>
-  
-  <!-- set global properties for this build -->
-  <property name="user.name" value="intarsys consulting GmbH"/>
-  <property name="jbig2.src.dir" location="src"/>
-  
-  <target name="init">
-  	<property file="build.properties" />
-
-	<property name="jbig2.build.root" location="${build.dir}/jbig2"/>
-  	<property name="jbig2.build.dir" location="${jbig2.build.root}/build"/>
-    <property name="jbig2.dist.dir"  location="${jbig2.build.root}/dist"/>  	
-    <property name="jbig2.javadoc.dir"  location="${jbig2.build.root}/javadoc"/>
-
-  </target>
-	
-	<target name="make-structure" depends="init">  	
-	    <!-- Create the build directory structure used by compile -->
-	    <mkdir dir="${jbig2.build.dir}"/>
-	  	<mkdir dir="${jbig2.dist.dir}"/>
-	    <mkdir dir="${jbig2.javadoc.dir}"/>
-	</target>
-	
-	<target name="clean" depends="init" description="clean up" >
-	    <!-- Delete the ${dist} directory trees -->
-	    <delete dir="${jbig2.javadoc.dir}"/>
-	    <delete dir="${jbig2.dist.dir}"/>
-	    <delete dir="${jbig2.build.dir}"/>
-	</target>
-	
-  <target name="compile" depends="make-structure" description="jbig2 compile" >
-    <!-- Construct classpath -->
-    <path id="jbig2.classpath">
-<!--	 	<fileset dir="${libs.dir}">
-	        <include name="**/${jbig2.jar.name}.jar"/>
-	        <include name="**/${jna.jar.name}.jar"/>
-	    </fileset> -->
-    	<pathelement path="${jbig2.build.dir}"/>
-    </path>
-
-    <!-- Compile the java code -->
-    <javac compiler="javac1.7" target="1.7" source="1.7" srcdir="${jbig2.src.dir}" destdir="${jbig2.build.dir}" debug="true">
-    	<classpath refid="jbig2.classpath"/>
-    </javac>
-  </target>
-	
-  <target name="jar" depends="compile" description="generate the distribution" >
-
-    <jar jarfile="${jbig2.dist.dir}/${jbig2.jar.name}.jar" basedir="${jbig2.build.dir}">
-	    <manifest>
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Main-Class" value=""/>
-	<!--	    <attribute name="Class-Path" value="${jbig2.jar.name}.jar ${jna.jar.name}.jar"/> -->
-	    </manifest>
-    </jar>
-    
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc" depends="make-structure">
-    <javadoc
-      packagenames="org.jpedal.jbig2.*"
-      sourcepath="${jbig2.src.dir}"
-      destdir="${jbig2.javadoc.dir}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="tools API"
-      doctitle="tools API" >
-    <classpath refid="jbig2.classpath"/>
-    </javadoc>
-  </target>
-
-
-  
-  <target name="buildZipSrcPackage" depends="javadoc" description="generate build sources zip package" >
-    <zip destfile="${jbig2.dist.dir}/${jbig2.jar.name}-build-src.zip">
-		<fileset dir="..">
-	    	<include name="jbig2/src/**/*"/>
-    	</fileset>
-		<fileset dir="${build.dir}">
-	    	<include name="jbig2/javadoc/**/*.*"/>
-    	</fileset>
-    	<fileset dir="..">
-    		<include name="jbig2/ant/**/*.*"/>
-    	</fileset>
-     </zip>
-  </target>
-
-</project>
-
--- a/dev-java/jbig2/jbig2-1.4.ebuild
+++ b/dev-java/jbig2/jbig2-1.4.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JPedal JBIG2 Image Decoder"
-HOMEPAGE="http://sourceforge.net/projects/jpedaljbig2imag/"
-SRC_URI="http://sourceforge.net/projects/jpedaljbig2imag/files/JPedal%20JBIG2%20Image%20Decoder/${PV}/jbig2_src_${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jbig2/dist/jbig2.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jbig2/javadoc
-}
--- a/dev-java/jbig2/metadata.xml
+++ b/dev-java/jbig2/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/jpwgen/ChangeLog
+++ b/dev-java/jpwgen/ChangeLog
@ -1,24 +0,0 @@
-# ChangeLog for dev-java/jpwgen
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Aug 2015; Mario Fetka <mario.fetka@gmail.com> jpwgen-1.0.3.ebuild:
-  Stable on arm
-
-  23 Jun 2014; Mario Fetka <mario.fetka@gmail.com> jpwgen-1.0.3.ebuild:
-  Update Requ to 1.7 java
-
-  18 Feb 2010; Mario Fetka <mario.fetka@gmail.com> jpwgen-1.0.3.ebuild:
-  add arm keyword
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> jpwgen-1.0.3:
-  resort
-
-  20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> jpwgen-1.0.3:
-  shorten to long description
-
-  10 Dec 2008; Mario Fetka <mario.fetka@gmail.com> jpwgen-1.0.3.ebuild:
-  correct typo
-
-  23 Jun 2008; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
-  Initial Version if jpwgen
--- a/dev-java/jpwgen/Manifest
+++ b/dev-java/jpwgen/Manifest
@ -1,5 +0,0 @@
-AUX build.xml 1013 SHA256 f47e8db56c9f63893acb9cb9641353b343087fbc3603f0b92af9a212b0a302e5 SHA512 ce206c61966d1cb828552fb4d59a543cdc5a98ecf03e6d38b3d0eaf1e15ac4fde9feaaf3aaa2ed8681d3e9916e79fb0481e82cdae98e38f9e6926f94de73c1e9 WHIRLPOOL d8cd085b57b1d1f166bafca4b732badc7563a07250e31548c7b0ed57e80586e946aa3cf3ddc5fb8cb9dd7637a75de102023695d3451b7ce085618842555b68fa
-DIST jpwgen-1.0.3-sources.jar 187827 SHA256 ab3b82b0b35b784e527c272fc7a731f971090317a015a627e4d791244803e6a2
-EBUILD jpwgen-1.0.3.ebuild 1017 SHA256 cadff1ce61e5063c3dea3fb2b50b051a9fd57226acc148f603bab72b13cb806c SHA512 63a625c2f24c8793c1113901878f27c5cd91b83b61b365da66930f512ede693ce9202a6fe0adad6e7cec24e8b4e349d1916d6190446a4244e84d8917e40b2427 WHIRLPOOL 760fa2e4285a5fa27fa5c9dca6fe2c33b10f30f49302e878f8ef6584e9bedc5b65d70a2707cc5d7248b41bf6f03de77b4f96ec2149afb2fc94a94b4fcfa4180b
-MISC ChangeLog 741 SHA256 3be3a3d6ea911e284dbaa2539cffc352e6820c9d46b47993df273b9c425c7fda SHA512 5b867f8875882b1b630536f28a4fef02c0fc9f27e7e7ffe9fbea18088bd8b72a5f22276ece68f04273a352a8ef0eeb9066c6b57f2860eeb6248e765c480dd0dd WHIRLPOOL 3013dbd8d5943572303db9217a082d5a24173dbed009b3d8ec9d8c213160ccac73f106d4a85438dc9927a3f83d714f4b70d1be7e97b62e3d05c078dac58b02cb
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/jpwgen/files/build.xml
+++ b/dev-java/jpwgen/files/build.xml
@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="jpwgen" default="jar">
-	<!-- some properties -->
-	<property name="src" value="src" />
-	<property name="build" value="build" />
-	<property name="dist" value="dist"/>
-
-	<property name="jarfile" value="${ant.project.name}.jar"/>
-
-   <property file="build.properties"/>
-
-	<!-- init -->
-   <target name="init">
-      <tstamp/>
-	   <mkdir dir="${dist}"/>
-	   <mkdir dir="${build}"/>
-   </target>	
-
-	<!-- compile everything -->
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
-   </target>
-
-	<!-- build the jar file -->
-   <target name="jar" depends="compile">
-      <jar jarfile="${dist}/${jarfile}" basedir="${build}">
-        <fileset dir="${src}">
-	  <include name="**/*.png"/>
-	  <include name="**/*.ucd"/>
-	  <include name="**/*.properties"/>
-	</fileset>
-      </jar>
-   </target>
-	
-	<!-- clean up -->
-   <target name="clean">
-	   <delete dir="${build}"/>
-	   <delete dir="${dist}"/>
-   </target>
-</project>
--- a/dev-java/jpwgen/jpwgen-1.0.3.ebuild
+++ b/dev-java/jpwgen/jpwgen-1.0.3.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java-based password generator whose functionality resembles the popular 'pwgen' program."
-HOMEPAGE="http://jpwgen.berlios.de/"
-SRC_URI="mirror://berlios/jpwgen/jpwgen-${PV}-sources.jar"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEP="dev-java/commons-logging
-	   dev-java/commons-cli"
-RDEPEND=">=virtual/jre-1.7
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.7
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-
-	cp "${FILESDIR}/build.xml" "${S}"
-
-	cd "${S}"
-
-	mkdir src
-	mv de src
-	echo "classpath=$(java-pkg_getjars commons-cli-1,commons-logging)" > "${S}"/build.properties
-}
-
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_dojar "${S}"/dist/jpwgen.jar
-	java-pkg_dolauncher ${PN} --main de.rrze.idmone.utils.jpwgen.PwGenerator
-
-	use source && java-pkg_dosrc "${S}"/src/*
-}
--- a/dev-java/jpwgen/metadata.xml
+++ b/dev-java/jpwgen/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-</pkgmetadata>
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@ -1,6 +0,0 @@
-# ChangeLog for dev-java/jython
-# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  05 Mar 2017; Mario Fetka <mario@gentoo.org> jython-2.2.1-r1.ebuild:
-  Correct deeps
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@ -1,5 +0,0 @@
-AUX jython-2.2.1-build.patch 3285 SHA256 3078b381ac9a4ef0edf03b6c3253cbe436497b9f843aa45e43194e8b36f2d7e4 SHA512 e0936cd6fdca71f4df7c77959c343bcf74af496b048bbd2d285eb961700d0dd875c386d4efd85a61f89dcb67e55bfcff5f9e480e1e85bdfcbcd26aebefcb0397 WHIRLPOOL 2b3997555b38d3f5b8c7f75955a25eba66ef5a1a870a10e86ac6426e38bb9d28b0b3129437a13325290ea6bd943dc16cbd624b5cb6e4849ec8e756e58a8cc299
-DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
-DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8
-EBUILD jython-2.2.1-r1.ebuild 3671 SHA256 7e74dbc5ab5031c64e610014d650df832350caba7faa72ea0aee33018552f3e5 SHA512 fddad2717d70fa3f24174d41abce52b3dd9cc74efe248e048091fe7333df1263514bdb7405ea69792aececcb9f38b78764244d0347cac892d84314165eee9ab9 WHIRLPOOL bddc8615834e4a264f8f34e265396d05919adca669c4b530077b0a58cd8421629ae1a1910f1328c85bc74879622a5e76337b776c9fb8f85fa5d739fc26740db0
-MISC ChangeLog 202 SHA256 e405c30eef3e9c87e6c4c250ea969869468e1595c0c8396a1224bbe393c57b32 SHA512 7830e303d48257e9177165352103a538af28d7637c2c2a36ff487ec4183e86ebd9943f23677947ac2b442cffc62f60bcb64e50a1c602575f45f7eb4f4cceb65f WHIRLPOOL a08cc73f60440af30a50aed74b7d67425fa39ca971a30519de16f63e7a8837f70fbb2a89cf474aa87950e0866f7c3ef4cca5c0671b6cf2afcb4a068a759f2369
--- a/dev-java/jython/files/jython-2.2.1-build.patch
+++ b/dev-java/jython/files/jython-2.2.1-build.patch
@ -1,76 +0,0 @@
--- build.xml.org	2008-02-26 22:35:07.000000000 +1300
-+++ build.xml	2008-02-26 22:35:48.000000000 +1300
-@@ -373,21 +373,13 @@
- 
-     <!-- create checkout directory if necessary -->
-     <target name="prepare-checkout" if="do.checkout">
-        <mkdir dir="${svn.checkout.dir}" />
-+	    <echo message="Removed by patch." />
-     </target>
- 
- 
-     <!-- checkout if so defined -->
-     <target name="checkout" depends="prepare" if="do.checkout">
-        <svn javahl="${javahl.dir}" >
-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" />
-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" />
-        </svn> 
-
-        <!-- checkout cpython license from the correct python maintenance branch -->
-        <svn javahl="${javahl.dir}" >
-               <checkout url="http://svn.python.org/projects/python/branches/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
-        </svn> 
-+    	<echo message="removed by patch" />
-     </target>
- 
- 	
-@@ -551,28 +543,13 @@
- 
- 
-     <!-- build the .html files using the ht2html tool -->
-    <target name="doc" depends="compile" if="full-build">
-        <fail unless="ht2html.dir" message="ht2html.dir is not set" />
-        <copy todir="${dist.dir}/Doc" preservelastmodified="true">
-            <fileset dir="Doc" includes="*.ht, **/*.gif" />
-        </copy>
-        <!-- Create .html files in Doc -->
-        <apply executable="${python.exe}" dir="Doc">
-            <env key="PYTHONPATH" path="${jython.base.dir}/Misc/htgen" />
-            <arg line="${ht2html.dir}/ht2html.py" />
-            <arg line="-s JyLocalGenerator" />
-            <fileset dir="${dist.dir}/Doc">
-                <include name="*.ht" />
-            </fileset>
-        </apply>
-        <delete>
-            <fileset dir="${dist.dir}/Doc" includes="*.ht" />
-        </delete>
-+    <target name="doc" depends="compile">
-+    	<echo message="Functionality removed by gentoo patch" />
-     </target>
- 
- 
-     <!-- javadoc -->
-    <target name="javadoc" depends="compile" if="full-build">
-+    <target name="javadoc" depends="compile">
-         <javadoc sourcepath="${source.dir}"
-                  destdir="${apidoc.dir}"
-                  source="${jdk.source.version}"
-@@ -588,7 +565,7 @@
- 
- 
-     <!-- copy for full distribution -->
-    <target name="copy-full" if="full-build">
-+    <target name="copy-full">
-         <!-- Misc files -->
-         <echo>copy misc files from ${jython.base.dir}</echo>
-         <copy todir="${dist.dir}" preservelastmodified="true">
-@@ -599,7 +576,7 @@
- 
-         <!-- copy the CPython license -->
-         <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
-        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
-+	<copy file="${python.lib}/../LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
- 
-         <!-- sources: todir has to correspond with installer/**/JarInstaller.java -->
-         <echo>copy sources from ${jython.base.dir}</echo>
--- a/dev-java/jython/jython-2.2.1-r1.ebuild
+++ b/dev-java/jython/jython-2.2.1-r1.ebuild
@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle"
-#jdnc
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-
-MY_PV="installer-2.2.1"
-PYVER="2.2.3"
-
-SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
-mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-CDEPEND="=dev-java/jakarta-oro-2.0*
-	readline? ( >=dev-java/libreadline-java-0.8.0 )
-	mysql? ( >=dev-java/jdbc-mysql-3.1 )
-	postgres? ( dev-java/jdbc-postgresql )
-	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
-	servletapi? ( java-virtuals/servlet-api:2.5 )
-	!<=dev-java/freemarker-2.3.10"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		dev-java/javacc
-		${CDEPEND}"
-
-S="${WORKDIR}"
-
-#Tests currently very broken. Need to investigate whether that
-#is jython's or gentoo's doing.
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-build.patch"
-
-	rm -Rfv org || die "Unable to remove class files."
-	find . -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-
-	echo javacc.jar="$(java-pkg_getjars --build-only javacc)" > ant.properties
-
-	if use readline; then
-		echo "readline.jar=$(java-pkg_getjars libreadline-java)" >> \
-		ant.properties
-	fi
-	if use servletapi; then
-		echo "servlet.jar=$(java-pkg_getjar --virtual servlet-api-2.5 servlet-api.jar)" \
-		>> ant.properties
-	fi
-	if use mysql; then
-		echo "mysql.jar=$(java-pkg_getjar jdbc-mysql jdbc-mysql.jar)" \
-		>> ant.properties
-	fi
-
-	if use postgres; then
-		echo \
-		"postgresql.jar=$(java-pkg_getjar jdbc-postgresql jdbc-postgresql.jar)"\
-		 >> ant.properties
-	fi
-
-	if use oracle; then
-		echo \
-		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
-		>> ant.properties
-	fi
-}
-
-src_compile() {
-	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
-	local pylib="Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib} -Dsvn.checkout.dir=."
-	LC_ALL=C eant ${antflags} developer-build $(use_doc javadoc)
-}
-
-src_test() {
-	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
-	antflags="${antflags} -Dpython.home=dist"
-	local pylib="Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	eant ${antflags} bugtest
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-
-	dodoc README.txt NEWS ACKNOWLEDGMENTS
-	use doc && dohtml -A .css .jpg .gif -r Doc/*
-
-	local java_args="-Dpython.home=/usr/share/jython"
-	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
-
-	java-pkg_dolauncher jythonc \
-						--main "org.python.util.jython" \
-						--java_args "${java_args}" \
-						--pkg_args "${java_args} /usr/share/jython/tools/jythonc/jythonc.py"
-
-	java-pkg_dolauncher jython \
-						--main "org.python.util.jython" \
-						--pkg_args "${java_args}"
-
-	insinto /usr/share/${PN}
-	doins -r dist/Lib registry
-
-	insinto /usr/share/${PN}/tools
-	doins -r dist/Tools/*
-
-	use doc && java-pkg_dojavadoc dist/Doc/javadoc
-	use source && java-pkg_dosrc src
-	use examples && java-pkg_doexamples dist/Demo/*
-}
-
-pkg_postinst() {
-	if use readline; then
-		elog "To use readline you need to add the following to your registry"
-		elog
-		elog "python.console=org.python.util.ReadlineConsole"
-		elog "python.console.readlinelib=GnuReadline"
-		elog
-		elog "The global registry can be found in /usr/share/${PN}/registry"
-		elog "User registry in \$HOME/.jython"
-		elog "See http://www.jython.org/docs/registry.html for more information"
-		elog ""
-	fi
-}
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@ -1,19 +0,0 @@
-AUX oracle-jdk-bin-1.7.env 880 SHA256 dcc5117fdac4e0ecda89388ef86c575920ee1554df89e534e25972e503b2225f SHA512 67a63ad1769f9ef2a07345daa43b064501f297181a49ff19c194c8ada32a331e73904e5f6a11a9f30a5974ae7370fa251ad6de45bcf049cf02cdeb7d084f55eb WHIRLPOOL 3bab14a9af5c627b4e852b5f37025f4061159b24e333d55bf32c61678f2fa11e7ae85bc7bd3868711a35edb7bba9e6417e9b8b28bddaf9e84bafe31a1c9a53ea
-DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
-DIST javafx_samples-2_2_80-linux.zip 21218149 SHA256 bd632d2c0f36be8bfc798ee6b78b328ff12d9b6ccea5e077dffc7a06f7933819 SHA512 00ec77bfbc7c9a9b1a61acb360b8278febd07bd16fc407a0b52ca0b694d35c79c0fb92d11caf131a8ee16238275962f6bc2e1f8471740ee0045b96bd14e957ba WHIRLPOOL b3f5032b1496b1bb8776e79566ed6a3da1dec3ab2b6d66d3cf67901bbaab5e746a1f3967af271c7b5a90b4522b6763ad7a5f172dfcf588184c5392a1a8a5a785
-DIST jdk-7u80-linux-i586-demos.tar.gz 20827120 SHA256 27b7c4955d989c9c34a6eed9e08f1955e01546146ed6fb1223f04ef33d143900 SHA512 25fc9ff9ee993ccf8d4caf0701b1e8e5ffdc78c68b0e94a93eb49f3cbc54f739a1699090e675439df9b63338974f5b9a04f6e33df59f6193b42a87a9a437ff47 WHIRLPOOL 25d8ef0b3205ede51eb2ba306d98d7eac91e06d0ca13b771593f343ac27df1d085cfd65a98346c63e76498eb19c106302407615218a907c8f6ea2e743eae09bc
-DIST jdk-7u80-linux-i586.tar.gz 154850445 SHA256 9ded1318a7223cf6e09ac4b6ee4db1f4c5d1aef1d3d291f6db8491a32eaa57ba SHA512 69e2ee7964b18e9e8b57db917b303eb9ea629c432300fe4749177118d2f5c365e72b976649e21354643fe4957120a2b23de025bab4dc45977837d4847a61ffb6 WHIRLPOOL 2d549c7971935f79e536de8bb0a5fc2547a8bdf039d1617a73fbc0ae222a80422fb336105c3362521efb376aa2ea6fa8c3a0521044785bfc9dc061ebe694628c
-DIST jdk-7u80-linux-x64-demos.tar.gz 20882163 SHA256 09c55d37508ff6c4b9ebac34e8d5fb65d7ace5cf45d5074726b413e8aa30dfa1 SHA512 2c24799ca0f14d74053e504cee0a9160472fd7e26e1d86d4eb72b190ec934b041bd72b5ce77f44bdca4b7fe8d8104515572491145f2f14e6d295be0bb010b2ef WHIRLPOOL e9f0312261049a5610ffbc64417f41025f36fc0ffec0f40dbcdfd391a3152f1c05ef80d584671d46fe26f86846825ea66e91090159e79a5192f11c695396e8ef
-DIST jdk-7u80-linux-x64.tar.gz 153530841 SHA256 bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623 SHA512 a772878f740e87835bafc82841e8f4c1dfbe8bc79e072d3f6c5c74d3a206eb9001a53b474d91a22819c7c0d6407ed88993635c39738779c2b08c22c7a1c2e9e9 WHIRLPOOL fac71585db57851245891919daca1f043c1a8c002c193426ea7e30b482129e65adee336c2421e4aa1241b8fd7cc69b8a1918cd0c44315bf4aec715e86d116384
-DIST jdk-7u80-macosx-x64.dmg 206510745 SHA256 2b9deef240a7f07d08541da01bbd60cbf93bf713efd5997e586ba23ec4f5089e SHA512 99150dd7bcc0ceddb12c7690b341323bb49fd0a8b98680176ba964ebbd37fe3e2fd1febad64b376a9fbbb19d883f5800613a8dc6c644de5f36cd7aeacb4d6e3a WHIRLPOOL 41ccabd45b6b8bdd43ca308fdbe3b1c3e89b58aa80336b2810c5bc4b57adc14cd98914467dac582eccd69e03bb911dd5f7d6c30d4ee5a8be2d7eb05607e12035
-DIST jdk-7u80-macosx-x86_64-demos.tar.gz 19394289 SHA256 27b3f9f12e8e6b56b6f42cbe2ba0e04cb3521c487162ef4de366ba6bb6c60735 SHA512 1dea5c171ffa93a1f111c59b2138f983307bdc4ec0e98ab848dfc040af5a39d8a1ff85fdc3997eeb190499a28565da18284610605a346977c173267a98edbc54 WHIRLPOOL 79f2410802cf476dd5fa6817bfa0538fdf1bc4158d32c1ccd9748b81c7640ff0d6ea92e3bb25e8d29fc7687ef6163b1cf386f852fb2e5960a3f77fa6e392bc73
-DIST jdk-7u80-solaris-i586-demos.tar.gz 16855430 SHA256 27b4aa795a9e57436d4b3aa11ea00bcf34442a95921e50a086ebdce94cb5f19a SHA512 9af21b132609cdb237bc63e4e739e81589f90445f116434ae7cad744fadefb38790d78fde7ff4d13689d275fe5a814c283f280d0485f0ec85147376672040de6 WHIRLPOOL e7ee65da144034781c84f07073ff23ee57561f838c85c7e7b24cb3b1b8d0e6f0393666383ac4473cd7d05d75e98406ec6484b447a17192c8a65eb6281622839f
-DIST jdk-7u80-solaris-i586.tar.gz 101088226 SHA256 c29d5f70359201c85ff23a103d71b768100ab23d1417433867ab418bdd46cc39 SHA512 16219609a356339a8575880f44b9eefe4459681202ff0925740f921a7239ebf5fe718c2607cbbebe790d8afc0ace25583c9b3ad67257d0a48cb32032072b2b3f WHIRLPOOL 50e09a1318d3e4a2262fbccd54946f86549314878f019d46efed350d31e9fc35df549b5ed6a305c63e61eace0f360e88bcaa21795abd6a93518be72e70f42bf6
-DIST jdk-7u80-solaris-sparc-demos.tar.gz 16881622 SHA256 e71933842bbc3ebb36b0b529c583bbff175a4ba88118d4460acb49cd6d615852 SHA512 843b139e793744b8e6d3370a7a036e7c16604a7d8310da363594460ebf72f912373392a9046b3d2ef51b5e275affda6b7f87e3b9e1e9ef096763b0b2e59b6f48 WHIRLPOOL 84bb9d1f3fc410fa15b5c1d6e8e179cd80cfa35d73c118d33c5d477cfa12cf29906a36499b8dc8f1a6b221cf4df9144c0dfb878acd1902ab7b63efa340214985
-DIST jdk-7u80-solaris-sparc.tar.gz 104306569 SHA256 1bbab4305af963dc6d964fbc3083aa132f71a30ba285f50f0c2b6894f7403d25 SHA512 1c19cc5cb90cd8b64adab70707a6c47f78fdbdc4a8e33b9523f94e7a0cee66746cc061a6c640da4dd9751adbfaa14f09fc2e7ca950317bb3b17c2829a4102342 WHIRLPOOL 4bd0ccd7d284e17a3517318ef803cf69e1555186bc65d3d7c6a2ee79d173fdd6a7fb16568fefed5841f10cecb83c85c9f3d0c3cee1448d838641294de7005713
-DIST jdk-7u80-solaris-sparcv9-demos.tar.gz 904770 SHA256 fa3a92e70e52b0bffdee8d2e640587d308cacb0390a5c9dd33c80f1f5a039df1 SHA512 2c7754f9a8fc0440e3174c90c4eb79f94827b6337331e55da6fd19dddee8d70cfa979e65df0459ad9c21e858b4bbcb7d3906d18b6153785ce0128837ffd0d161 WHIRLPOOL 76ef02524bcb4c90b51f78413c366ea37f99bcde88e049402f5fb05303911c473b7acb4c18ccc667b9c61584e8af3b6dbb193fd8ff2f80858720446d3474248b
-DIST jdk-7u80-solaris-sparcv9.tar.gz 19301205 SHA256 1a2bce541efe7b81cafe683626b3edea56918a8ca897ff36a2deaed00a7fce05 SHA512 93ea0e8f5ae611dd1a620dffd72e315ecb6ce8375bd902a793fab128ac7e95d2cb338df1c273a2c29af6194e7cbdb810d79193b413b4b101538c08ebeef1eb41 WHIRLPOOL c9ae1f1b561c4ec1d3c1a7f5008e80642b49a9fd1c6459f8ada65c01accc338280bdd683712d54a9b7741eeccf856b4f2ee82e898fbe1f39260d58efab217185
-DIST jdk-7u80-solaris-x64-demos.tar.gz 865205 SHA256 a08dd0665d35986675beeba0f80d5db54a91fb276d8641ce1ba16ba873a18682 SHA512 c53f026bfdfed8d83d42e3fce497baffeb370adf0423be2f891f6d200510088ac8227ae4f261ece059dbf29eb33cacafb20a0c328e7d8723387eba38def389d0 WHIRLPOOL 0539e964e194527055186b120df11e74ab3d9568fc2a5ff002ef405396f521a7c35013420067d37874b9602fe29d104dce63f22bfd687c45722689d62a8c552d
-DIST jdk-7u80-solaris-x64.tar.gz 17176587 SHA256 ccc156363e3080e92382cd675d96889460a4421464b4567333394c8405eeb709 SHA512 83ce229c3a38e454d9acafa189b3b6f247a4723ddb3c3fa08993323590949295b0f3740ab235c7c539f90a684b8cefad7839f82f566b7a141019b94af6cbad89 WHIRLPOOL 07412c6de5886c729b43726fb228783606b2a53c2a286b1af2dd5359975d1c75964a895d7da543f98c461adf0ab4b82fc32ebeb49e1835448effd93886f1b206
-EBUILD oracle-jdk-bin-1.7.0.80.ebuild 10449 SHA256 f6675e24d83354ab92948106907a5648c36767cea5bceadde0842e8d28d7ab1d SHA512 672eeb6235a68b9c8813417695598b8c3be3f3742ea2c1a4a517067ff4999ff4ae97ed86cd016f53edbd09f6ee4f6e9ec5b1b71f588568944e2bb87794d28d14 WHIRLPOOL eec86b015c4447c0866fd13146597d540b268827aef132d5ea89814184f52c6186955c586f8f84b74af27e27770b36d1c61968433404a67f82f2695e735f7aa3
-MISC metadata.xml 653 SHA256 d8751066c5e22456dee1849fad9bf32235e4024f74868d24d5594a26f3db78b6 SHA512 e4782bcff1ea2456d6d31e1f1831cdcf5e3a3f548aafd9fc07e874c499c3325129d9cc6c2d71c343035b46e125c22346f56d4ddb3774bc46ce8efbd2cbce7b53 WHIRLPOOL c0c20c4addcee87e80167ff979a819b4655907df3145bd850a57c1b0cf54ae08d80be9d341bd11f9f924d5b912eb7e4c24fb733eb359632206d7c0f3bed4bb0b
--- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="Oracle JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.7"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/classes"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@ -1,15 +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>
-  <longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
-  <use>
-    <flag name="derby">Install bundled Derby (Java database)</flag>
-    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
-	<flag name="pax_kernel">PAX Kernel</flag>
-    <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
-  </use>
-</pkgmetadata>
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild
@ -1,307 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html#jdk-${MY_PV}-oth-JPR"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
-FX_VERSION="2_2_$(get_version_component_range 4)"
-
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
-AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
-AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
-
-DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
-DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
-DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
-DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ("
-	SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-COMMON_DEP=""
-RDEPEND="${COMMON_DEP}
-	X? ( !aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	) )
-	alsa? ( media-libs/alsa-lib )
-	doc? ( dev-java/java-sdk-docs:1.7 )
-	fontconfig? ( media-libs/fontconfig )
-	!prefix? ( sys-libs/glibc )
-	selinux? ( sec-policy/selinux-java )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="${COMMON_DEP}
-	jce? ( app-arch/unzip )
-	examples? ( kernel_linux? ( app-arch/unzip ) )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}"/jdk${S_PV}
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}"; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]]; then
-		if [[ -z ${_check_tarballs_available_once} ]]; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-		einfo "If the above mentioned urls do not point to the correct version anymore,"
-		einfo "please download the files from Oracle's java download archive:"
-		einfo
-		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-${MY_PV}-oth-JPR"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	# Special case for ARM soft VS hard float.
-	if use arm ; then
-		if [[ ${CHOST} == *-hardfloat-* ]] ; then
-			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
-			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
-		else
-			unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
-			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
-		fi
-		use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
-		use jce && unpack ${JCE_FILE}
-	elif use x86-macos || use x64-macos ; then
-		pushd "${T}" > /dev/null
-		mkdir dmgmount
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
-		hdiutil detach "${T}"/dmgmount
-		zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
-		mv Contents/Home "${S}"
-		popd > /dev/null
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
-			{,jre/}lib/i386/libjavaplugin_nscp*.so
-		rm -vrf jre/plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
-			{,jre/}lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby; then
-		cp -pPR db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		cp -pPR	demo sample "${ddest}" || die
-		if use kernel_linux; then
-			cp -pPR	"${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
-				"${ddest}"/javafx-samples || die
-		fi
-	fi
-
-	if use jce; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	if use source; then
-		cp -p src.zip "${ddest}" || die
-	fi
-
-	if use !arm && use !x86-macos && use !x64-macos ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x86-macos || use x64-macos ; then
-		# fix misc install_name issues
-		pushd "${ddest}"/jre/lib > /dev/null || die
-		local lib needed nlib npath
-		for lib in \
-				libJObjC libdecora-sse libglass libjavafx-{font,iio} \
-				libjfxmedia libjfxwebkit libprism-es2 ;
-		do
-			lib=${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${lib}"
-		done
-		popd > /dev/null
-		for nlib in jdk1{5,6} ; do
-			install_name_tool -change \
-				/usr/lib/libgcc_s_ppc64.1.dylib \
-				/usr/lib/libSystem.B.dylib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-			install_name_tool -id \
-				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-		done
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@ -1,20 +0,0 @@
-AUX fontconfig.Gentoo.properties-r1 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
-AUX sun-jdk-1.6.env-r1 1015 SHA256 31302b5ed417a294ecc9c475a08aca331a07c59d2c095978a574a7347aa12f6a SHA512 958c7d0ef04f30b07e8ee1ec36c3637ae2d2abc0d9f6da08b75b9bf81845caf1a7ac8e805e04ad39625cea4e8397174739cc72c33c13c57a8aa0886df3e95d3d WHIRLPOOL dbb7cbc7cc44c32011703ea9f9413a8798d922cc69f3ab67fb8af55a6914cacfad2b91a48f6a58428f1b71301f8287db07759d4d64ffaeb9c639b9a4a6debbcd
-DIST jce_policy-6.zip 9101 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262 SHA512 a1aa55f2ad919efcf63452aaa96303328b7449626efb342a7f8d9e7a4fe9c06ce22ce33fb89e768602b172b7d9538c432e82523addb0bbd4d1be22f934576b56 WHIRLPOOL 144a4891ca3f5f88f72c1a13283823845bd7e46b5fe941b4c192705e20e9fcbbf27819ee926577218dd3b222e41f7ee149cab6f9eea5a46febebea00ad2ed3bc
-DIST jdk-6u45-linux-i586-demos.tar.gz 12073459 SHA256 1e748de12946f8ec9b83ed8caa4cfda9a7ebbc52d62f39fcdba27f7f6bcf7d46 SHA512 c19260a669d8b31879421e0eef08f4ec2bb37bae085f656e5e627f405b346a2be2e76aa10f61381fa08244736f1b7d0b49af44c5d6cfff65ed2cefe44ad8d441 WHIRLPOOL 15949ff291fc20b27032e6363a0ebacf8a532fe536f06e29c1f6e8b45cf3a4fcfe5fa47961d2c0ed0fb112e8e84f124067b8002758793682b13dece816d6c7d4
-DIST jdk-6u45-linux-i586.bin 71799552 SHA256 d53b5a2518d80e1d95565f0adda54eee229dc5f4a1d1a3c2f7bf5045b168a357 SHA512 9539da9779c0a74165da24bd5730b8b7e58f4b8a38841de04919af8a957fa83f32367fdcb393d4ac756feccaf0cf014ebf2f74180f9301d22944fa30dfb87777 WHIRLPOOL 47a88a246ac06fc1275e16d6dac6c859ffa4598ce6940f2910d6be616c88475dbd0638654cdba82bdb3a29e9f2f0a80267c127f51392c3400392ffa168cf4631
-DIST jdk-6u45-linux-ia64-demos.tar.gz 6858761 SHA256 4d2ad7d92d7966a009b2006002d80960aac803e7cafe9d0a8bd8976c258a99ec SHA512 82b4e65ca455dcc2d916bd92c6b0d9c9333db7379882610ece3f1d99d35aa7792dc6e4236d74340175c5ec8c02db6d512406ea837d5e0f738dd6211d730e7e03 WHIRLPOOL 9c1cbff1cbf881b502f4a8f8374cae3f3ead0c936b7347fd67b60904957716f5ff457f2bd4e32e81959b54dae18fe4907ab0f8ab5c544bf249148769d2c4c85e
-DIST jdk-6u45-linux-ia64.bin 58719923 SHA256 6979b4e2e6dd11310760d13e8fea040e1be1419b0fac2fd44f1bf7173ce4fee6 SHA512 8acb10bb6335f267ae4b53d08167cebad41bc6a34300305e46a31d13b492fb9e4c3e4c28f0989b1412de3745f54db5d8c730eb76aaf6d1712ed31a2d3268d1cb WHIRLPOOL 50166f80eaafd64d39945d62b4c905cc7cf686e0f210d0a0a0807c100245139c9f136220875821ede9611376b3e8453247908cf4ae00a35d0cbde3caa03b9b44
-DIST jdk-6u45-linux-x64-demos.tar.gz 12104609 SHA256 abc7d2e3fd16f788675403f26af17ae29325002e1ef45ddfa69e8a4bb7964838 SHA512 ecfa8f911c8a73bd00edb82ea5668a589106667fa0a67875ab1a0bbe406574ec804007f7f622b4cc391d7b5a06d2b0d137c3b61a7891a74f0a85a42df463f63b WHIRLPOOL 969b385e3275bfbccfa41885b9ef1c8a2d26b2a292c2187efb0d1218aa744da1e56083f29b30a38a1d36dbbea241621654a73df391b502e557bd6e61e40186ef
-DIST jdk-6u45-linux-x64.bin 72087592 SHA256 6b493aeab16c940cae9e3d07ad2a5c5684fb49cf06c5d44c400c7993db0d12e8 SHA512 bf2fcb8696b9e43af80d9114fd984d86317422e8c65dd464a7abff4017a5c4c0d8ebdbd8418270fc8c6c52c2b97498f02742440ed4f8394b3612d2e2186c30d8 WHIRLPOOL 1c9861e66e3e8f45f7f4284e09e87ee4fd1347687010b8ecc87666b9df070d33921ffd60f727e6630caac4db2b50ae6a3f432987062469daa06130c7b4e62f15
-DIST jdk-6u45-solaris-i586-demos.tar.Z 17934236 SHA256 f23e90da3ccdb964a0b646e2b09cbc442f59f6c5448555f41a7b75b0a25f0022 SHA512 8cd84c860a807de7bb8f73edb403357d307e0f62a37c8fc4721e1645d8088350fd29570eff5bcbe1abbc6114b59f44b4a98624d4e94c905b930e3e9c84aafd60 WHIRLPOOL 3abd2623865c11cfcb7960a8e932258ec32277e80e3178ddf343c8b05c6dee8718d8b7c3327dde26c15eec28d650dcd350be06fff067b88016515abc8e5cccd8
-DIST jdk-6u45-solaris-i586.sh 71704137 SHA256 e62c6e0305b1b69f37a5dab1f2f9369da3749e8f95f106ba96f88bc3232b288b SHA512 f38ee02fd782305e0eec4f9267772bf0b8f145b3e1fda6b8b35a09e4b154c0cb0cb159f1c51d2ee1d1f1dbba1ca0736fcbd50cf5f42ae9dccc58f8cde9f7a038 WHIRLPOOL e76d32e2c85496c6a596edf16ebf3941a05ec65d5f9c758658c7ed983c7ab1245d589a0f2358a57b939ce75fe1bd7d41fb8dbb3ce47552403a2793443912651c
-DIST jdk-6u45-solaris-sparc-demos.tar.Z 17931861 SHA256 719c8662c2bd6ed2b894a5b03096d50a1d8d9dfec54e8a85a12d0298b342b909 SHA512 0d7ab33234319b6e4e6cf2d50496ad57ee15a066ebe97afed7684e47cc907f9bd97ef28c7c7d3c78cc4bc9cef3580221dccd5bd4b0d9706dd15fd6339c1f3ad1 WHIRLPOOL 0a02654bd32f8c850e91a0d6abfc9ff83a7b2bf6c866d292253bcda06de70e7bbcfffbfa712bc8d3a15c70f8012e2c7936c30149b805703b9115114d072dbe35
-DIST jdk-6u45-solaris-sparc.sh 76971070 SHA256 3be55a2491ee332d3beb4653893d699075dab73407b88290304248d81c49d9d9 SHA512 6fff0a4ebb6deb3bbf16367c39e84bb7f88a4f7be6d39d879e7c987eeb0ff7148b6a1f814ec86764f2e4bc74ecbfa429d984c6510e391f1465cffd57c74ac089 WHIRLPOOL 171ae21157ba82e517a5ab7e3957044a0ff914f742e66e6ec13f8fe3cac786dd3bb511f2adab88cc83a2a5747d36cdd320e646e6d50710b75a90bd68b17bcf63
-DIST jdk-6u45-solaris-sparcv9-demos.tar.Z 66473 SHA256 7c4d9b616b802321449d91a2ca8a7d5fe601454be6d88fe0d2321366e3e89975 SHA512 72628ccd35def302d35a44ceb98e68b865fd0edbcb4bfc58f80fa7e7834461280312777ee173f7041b7d0a9469705421ae85a76dc7db36f9ab25bf61c768858a WHIRLPOOL ad706edd9ba0baee5fb1c448330b468b66bb82de178eaae6881ce7fceda7f0b1d028abd5d65e514e17cf514cb1d6daeb714173c3af41046d2142ebff73670336
-DIST jdk-6u45-solaris-sparcv9.sh 12785214 SHA256 2d0e5163effbac3e3eae1bbf0767f56f590a3e71fc74f63dd0ff5f9386384254 SHA512 24cd70c7133d4858e2c124f907f0731c01cbd9f4f599a24f044a4a351767002404cd269be15d6fbbc6888342cd36b2fa2a84c18b0e1aebe9d7974f4d6cbc374a WHIRLPOOL c851b49f5d65a59adc62e8f17ee5d2b8f51999377c4b245d713e3b2a00c49c64187a7bbadf19fd0e74f91ec003ab79475867f2f2b23e9ca5cd8d4254a4a9ea32
-DIST jdk-6u45-solaris-x64-demos.tar.Z 71857 SHA256 86ce6dfad3d4f596dfd40ab432139817062f61c6d800bd2d7dab76e22d2649e7 SHA512 14e0637ec2f0d536e41011996192150848a5311ac5bbae44c2b5e0e9bbdfe0a829e57a7a0a3912cf6fffe9fb26d9360206193957fdd5c0959e81b254a02c0667 WHIRLPOOL d26ed5891fbb5c4dbca0a95de0db683afc633afd0d56dab4c86c85348f763c3da49cf4c57c2ae12f32c77d9b4c7e46b1c5048c096800c1a0149b61e1af32eeaf
-DIST jdk-6u45-solaris-x64.sh 8907780 SHA256 b3f50fc921c07dee97781e322954021ebb10785ac4e8f4a4536dab239860c09e SHA512 cc262d3ef9c070ed7f1eab9141e9f509f16e6fb97534dd3ca48a65dad83124cf745894a3f73c270a0618220d1a541833f08970250bb697f584cf4d1e497d9e1f WHIRLPOOL f75c984d092bd93ae1213a83cc79604e65df118fba77f413979a5d34337cba52b0dedd72559a740911908475d6971fbe5198eabc6878bb20838dd8f3bc12a33d
-EBUILD sun-jdk-1.6.0.45.ebuild 8196 SHA256 857fc141beea6271b0e5d95f8dd65426e57408a9c570b23d9c143981ab9afb7c SHA512 888d03cdd1328cb247902c01c3901001d2e140ce9a42f88e1ababa9dfbe1a4c9cea310a6bb306fdcae3b56742d379e130e16c84298b1af77fd8dcabcf03010d3 WHIRLPOOL 69783a8d68cf24dd0c18dee9f224d34f1d5f11059edf3e2f036af4a47a5e6f811e8a13691ab1a4f213a61d5752eaa2404bb964d55aa462509a80544ac771e20b
-MISC ChangeLog 65115 SHA256 5c3c7da396420dfff136456619ae03851570e8ee2491340ca59357ed46d31dff SHA512 78d691e6432d27f9b348d13edadbcaa6ba9a2aaec485d1ed4c7af1be94b241b2811943fd222559cf7e52ccf859e54c671f1cf44374010a0fa85f66fe6d802e2c WHIRLPOOL 092c3b9917db592b77cc7dce0e7d980ff4075caf5081d472c02f6c85914c78f3564adac5307855513eb7ab9752eb071de16fe33cc6622563c7b0245be1b22513
-MISC metadata.xml 501 SHA256 08a1a9de353c1d04f91b559372baa885fba76dc04654d2543f6c723e013b12c4 SHA512 06b541c8c2e66e1237edc1b3885416aa6ab4531b9fa3f90e258718fd654837d019fa48bcd5a1220597f2fe8a2dac5c9d48d68a2076c04e423eeaaea0638fe420 WHIRLPOOL 361a32717dee2310fb2d07522428ae6fab422a34e2e97fa1fdfb8c20210946c1611a28029de663dbc39825fcc409839a2fd3a4adb977a12c1606d54b6026ca8b
--- a/dev-java/sun-jdk/files/fontconfig.Gentoo.properties-r1
+++ b/dev-java/sun-jdk/files/fontconfig.Gentoo.properties-r1
@ -1,161 +0,0 @@
-# Version
-
-version=1
-
-# Component Font Mappings
-
-allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0
-allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
-allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-
-serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-# Search Sequences
-
-sequence.allfonts=latin-1
-sequence.allfonts.Big5=latin-1,chinese-big5
-sequence.allfonts.GB2312=latin-1,chinese-gb18030
-sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208
-sequence.allfonts.EUC-KR=latin-1,korean
-sequence.allfonts.GB18030=latin-1,chinese-gb18030
-sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean
-
-# Exclusion Ranges
-
-exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be
-
-# Font File Names
-
-filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf
-filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
-filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
-filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf
-
-# AWT X11 font paths
-awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1
-awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute
-awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts
--- a/dev-java/sun-jdk/files/sun-jdk-1.6.env-r1
+++ b/dev-java/sun-jdk/files/sun-jdk-1.6.env-r1
@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.6.env-r1,v 1.1 2011/10/22 22:59:59 caster Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.6"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
--- a/dev-java/sun-jdk/metadata.xml
+++ b/dev-java/sun-jdk/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-  <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
-  <use>
-    <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag>
-    <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
-    <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
-  </use>
-</pkgmetadata>
--- a/Show More
+++ b/Show More