Include look&feel settings in the .jar file again, this time unpack them from bundled .jar before deleting, instead of FILESDIR, because they are not part of source files for some reason. Don't filter ecj-3.1 which was by mistake.

(Portage version: 2.1.2)
 (Unsigned Manifest commit)

2 files changed, 15 insertions, 20 deletions

diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
index 968035c0c9e3..3319614efc61 100644
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@@ -14,10 +14,6 @@ AUX plastic-1.3.2.txt 309 RMD160 3b5aef7b17a817d9e42bb14d63212fc0b96c5f08 SHA1 6
 MD5 043365a0dae7ff26fed565a6fdfe7738 files/plastic-1.3.2.txt 309
 RMD160 3b5aef7b17a817d9e42bb14d63212fc0b96c5f08 files/plastic-1.3.2.txt 309
 SHA256 d3ba64e98b55519c0445f3469b60681db3e83a2d639d758e30c17f72cff5fe6c files/plastic-1.3.2.txt 309
-AUX plastic-2.0.4.txt 309 RMD160 3b5aef7b17a817d9e42bb14d63212fc0b96c5f08 SHA1 695a6ca04bffdaa3dd0ee7e9b2ee951789cac144 SHA256 d3ba64e98b55519c0445f3469b60681db3e83a2d639d758e30c17f72cff5fe6c
-MD5 043365a0dae7ff26fed565a6fdfe7738 files/plastic-2.0.4.txt 309
-RMD160 3b5aef7b17a817d9e42bb14d63212fc0b96c5f08 files/plastic-2.0.4.txt 309
-SHA256 d3ba64e98b55519c0445f3469b60681db3e83a2d639d758e30c17f72cff5fe6c files/plastic-2.0.4.txt 309
 AUX plastic.txt 308 RMD160 edc0598408ad4fea32e25c861c77115b6b61f11f SHA1 f75872d121dd7c732a2d122b94df41bfcb2bcc8b SHA256 0f0601fbf99f2601e9b2a03c69ec71bd1f18f09475090db430a9322ae96f5544
 MD5 f237f515cdae3f2d57a487ea09a68880 files/plastic.txt 308
 RMD160 edc0598408ad4fea32e25c861c77115b6b61f11f files/plastic.txt 308
@@ -33,14 +29,18 @@ EBUILD jgoodies-looks-1.3.2-r1.ebuild 1223 RMD160 27d6d20465501bd07de6331167ea57
 MD5 b5cb2a906f5322b95c83a7177d072e03 jgoodies-looks-1.3.2-r1.ebuild 1223
 RMD160 27d6d20465501bd07de6331167ea57ce244cb86e jgoodies-looks-1.3.2-r1.ebuild 1223
 SHA256 bef89a25e2d5c1a7522052be98456b3717d10d32ebe947b90cabdb146746006d jgoodies-looks-1.3.2-r1.ebuild 1223
-EBUILD jgoodies-looks-2.0.4-r1.ebuild 1414 RMD160 757ffe3da0d51276f1a4e8d5e40d36711ddbe24c SHA1 b55e7a445398696b16fc2c170dfbee385454b37c SHA256 f4c4a6252e61175947420974d7a20cca6902f47a8bec9dcf9dea11323108e36a
-MD5 03d042e86aa54270d2f571a1e9203352 jgoodies-looks-2.0.4-r1.ebuild 1414
-RMD160 757ffe3da0d51276f1a4e8d5e40d36711ddbe24c jgoodies-looks-2.0.4-r1.ebuild 1414
-SHA256 f4c4a6252e61175947420974d7a20cca6902f47a8bec9dcf9dea11323108e36a jgoodies-looks-2.0.4-r1.ebuild 1414
-MISC ChangeLog 4940 RMD160 ed2228d8ee51801f0970f5df9f6dfc53b74892e7 SHA1 9f70bc5eff342627098cf94262a3063aee66a475 SHA256 915b2d08641c0e836e669c77a0a72c80e700eb9ad79d2d2836e820a1b4c35d2a
-MD5 9e86a76fc01f33ce70c75f518cdb58cc ChangeLog 4940
-RMD160 ed2228d8ee51801f0970f5df9f6dfc53b74892e7 ChangeLog 4940
-SHA256 915b2d08641c0e836e669c77a0a72c80e700eb9ad79d2d2836e820a1b4c35d2a ChangeLog 4940
+EBUILD jgoodies-looks-2.0.4-r1.ebuild 1405 RMD160 c2fb4cf71b9a0d83102808f1c8f48b5babe47ea2 SHA1 ef715310de7da4780b786e6b8928315e71e5bc6a SHA256 7a54e4190f28ce0e68da1cc3af9452d0db814db8b85b758c4227dfc13a14aeb3
+MD5 fbada54e9f0b4400835e12e031403c2b jgoodies-looks-2.0.4-r1.ebuild 1405
+RMD160 c2fb4cf71b9a0d83102808f1c8f48b5babe47ea2 jgoodies-looks-2.0.4-r1.ebuild 1405
+SHA256 7a54e4190f28ce0e68da1cc3af9452d0db814db8b85b758c4227dfc13a14aeb3 jgoodies-looks-2.0.4-r1.ebuild 1405
+EBUILD jgoodies-looks-2.0.4-r2.ebuild 1757 RMD160 8c5cfcbc0db266b5d84bf7f32328eb51825fe10f SHA1 a20b361f8ee243fc3f77f07adcbb36cd3c2e44eb SHA256 330957224d3fa2195b17aa23033f740f84b2ce9a1f32c82bda0bb4702cbbd0af
+MD5 1b955d17211c6001faddfe0651037a02 jgoodies-looks-2.0.4-r2.ebuild 1757
+RMD160 8c5cfcbc0db266b5d84bf7f32328eb51825fe10f jgoodies-looks-2.0.4-r2.ebuild 1757
+SHA256 330957224d3fa2195b17aa23033f740f84b2ce9a1f32c82bda0bb4702cbbd0af jgoodies-looks-2.0.4-r2.ebuild 1757
+MISC ChangeLog 5364 RMD160 b988d915c4032f328f0434c1ab4f04eeb1ddcbf5 SHA1 b16b27ad5a1619287ab211904f6bdf73ba6c6aaa SHA256 f243fb9a5b7649b716816640918e78ef20085594fa3a7baa623624308fbdb33f
+MD5 cf0cf34f10491cd1759ba87e399e4471 ChangeLog 5364
+RMD160 b988d915c4032f328f0434c1ab4f04eeb1ddcbf5 ChangeLog 5364
+SHA256 f243fb9a5b7649b716816640918e78ef20085594fa3a7baa623624308fbdb33f ChangeLog 5364
 MISC metadata.xml 308 RMD160 33de7a81ce13144e13716bd21f65918c0cc938b2 SHA1 5b67a7f1699038956898191aca4928696f640d6c SHA256 18737730ab8684f7b08ac54cb9d9500e6a5cac76fb710502dc411d3a2efe72ae
 MD5 0a7e021f886fb1b2e57c3ceb9eb8f9e7 metadata.xml 308
 RMD160 33de7a81ce13144e13716bd21f65918c0cc938b2 metadata.xml 308
@@ -54,3 +54,6 @@ SHA256 8ccd9bffffea87a3c3b1a174b9ae271350ef775cb5549ea27de27070281b3477 files/di
 MD5 3f95212287ae3b474aaf4139ab65e17c files/digest-jgoodies-looks-2.0.4-r1 229
 RMD160 ccd3d91808779bb846e9c9c591db20e904e77783 files/digest-jgoodies-looks-2.0.4-r1 229
 SHA256 249379e44c3993b88eae1ac98dbc859cabd69d018ba21dcfffae47b266cd6446 files/digest-jgoodies-looks-2.0.4-r1 229
+MD5 3f95212287ae3b474aaf4139ab65e17c files/digest-jgoodies-looks-2.0.4-r2 229
+RMD160 ccd3d91808779bb846e9c9c591db20e904e77783 files/digest-jgoodies-looks-2.0.4-r2 229
+SHA256 249379e44c3993b88eae1ac98dbc859cabd69d018ba21dcfffae47b266cd6446 files/digest-jgoodies-looks-2.0.4-r2 229
diff --git a/dev-java/jgoodies-looks/files/plastic-2.0.4.txt b/dev-java/jgoodies-looks/files/plastic-2.0.4.txt
deleted file mode 100644
index e887d9d13da6..000000000000
--- a/dev-java/jgoodies-looks/files/plastic-2.0.4.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# JGoodies Plastic L&F- replacement for Metal
-com.jgoodies.looks.plastic.PlasticLookAndFeel
-# JGoodies Plastic 3D L&F
-com.jgoodies.looks.plastic.Plastic3DLookAndFeel
-# JGoodies Plastic XP L&F
-com.jgoodies.looks.plastic.PlasticXPLookAndFeel
-# JGoodies Windows L&F
-com.jgoodies.looks.windows.WindowsLookAndFeel