Stable for amd64+x86. Remove old.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 16 insertions, 42 deletions

diff --git a/dev-java/tablelayout/ChangeLog b/dev-java/tablelayout/ChangeLog
index f37454b2eb2f..4de17db25dbb 100644
--- a/dev-java/tablelayout/ChangeLog
+++ b/dev-java/tablelayout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tablelayout
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tablelayout/ChangeLog,v 1.2 2015/08/08 10:47:05 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tablelayout/ChangeLog,v 1.3 2015/08/08 10:48:07 monsieurp Exp $
+
+  08 Aug 2015; Patrice Clement <monsieurp@gentoo.org>
+  -tablelayout-20090826.ebuild, tablelayout-1.0.ebuild:
+  Stable for amd64+x86. Remove old.
 
 *tablelayout-1.0 (08 Aug 2015)
 
diff --git a/dev-java/tablelayout/Manifest b/dev-java/tablelayout/Manifest
index f4089402dc54..757e02cffcae 100644
--- a/dev-java/tablelayout/Manifest
+++ b/dev-java/tablelayout/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Everything-2009-08-26.zip 178919 SHA256 9f576c6f5d3c647bffceb20f4b7d02faa696b680551dc9a8123abe218bc9a7d3 SHA512 53a2cfdc185796c924a351f4cabffa4563803714698e141a2782bab5544b81b680c7bc578abd5ac6aa6ddf7891d38d28199ebee672a688d54ea1cd591af760fd WHIRLPOOL 5b7ae5ecb1d284e97330676a4aa951c5eb9de1b8ba968ca54f7e2cc3b662889662b9d3c9e828abed49851611f915c29063977b40a2c3a61affdc30233e6cf932
 DIST tablelayout.jar 112151 SHA256 8ebba0e79da329d88a7c6c33560631143f2a329fdf0554c4e04e3a3049c99390 SHA512 b6e9ef07b50165679df8338123cc636b8165ab989e71afc9d1279e257bb171675aa46cc304e65d7e301c66117149675bd987c07d6cf5b03cd1c7768144e22902 WHIRLPOOL 323b524eff60c9970c91bb8ab6c870d525f92c674841061f269712e31e6cca40f498c43d5f4d202bf54012dcedc9c715ff3e8915d0bbff61ccf335c77c1c6cd5
-EBUILD tablelayout-1.0.ebuild 809 SHA256 7319d186fcf91a88ab5256dc7354f3361fc988bf84b75c3233573900823fe8c6 SHA512 23519797b5363bcf8a817a92a832cc901daa6c1550fe63f39a51fe85c2770f031703a866d9a05ae1ce7007261182639b4fda0adeaf6247a3dae4d3a4f1e81c00 WHIRLPOOL ca05a0b7c033e5675b383ff3978736fa3ee942249de39ac6b34871db51f707114b1f01d906934ba7d75852ca110378f66deab545d55fd5630626a4b5b4ba1c7d
-EBUILD tablelayout-20090826.ebuild 738 SHA256 3fbe0a18fdfa9fd712c17dd4ae21fa9b1fdc3a3dd59acac79db13a5f7872575e SHA512 cf997d835af251268b0c9aa6fd5caa428b9dedc5ea7ee47a1f08adf4f2d4828de18b6c8867cb076802e94a740125ac468a6e88506fd9666d3e419aae10f3829e WHIRLPOOL e7490420bff57a5e9ca37068f86392f89333db3bf4e60921743379ffc2fae7c848d707ff90599fd2872fa62f54a5006ea84c29423f1f1a52131375d85bda880c
-MISC ChangeLog 539 SHA256 efdfec96be0e38ca230417e2bea965aa10cd1369f005bd3dec2367f5662da42b SHA512 0a1ea0e2d3222696959eb28b90628bf64ef8b0111d5a7773c084b99ec240fa8da99a9c0b4d82f5c14015725de7e5ba0f221a5a331eafeb1736ffd151aac719fb WHIRLPOOL 95f9e76b1edbe4aa5b29d863911d453bd02b2af0b53d6dfd10942dcf062d54461b56722dd3ba10db0a2b574db7d6c14d34dde4f8d8ca653382ee267f88af7b6c
+EBUILD tablelayout-1.0.ebuild 807 SHA256 f7c46ade4464af0f9786b3082eba23c09fbcb2f13e25745622b7a9164e60d580 SHA512 f4efb6a5720d5ae670347624d3ee86f477f4c6fef2f1d2f425312830ab0a1962e13973c06aeddfe80a904a277209b1b6fea5baed4a58e159cadb92c904d11c24 WHIRLPOOL bc9f01a99fb3108555cc705c1ac3ff1e755554b796b82ea4e2dbbeb83128dfeef48c725cbbc7bb02fc5617e99cf5f196dc94bcee8008231223753350ef033557
+MISC ChangeLog 686 SHA256 edc9984b78cc7906453e972477171a623c66f0c5d2e97bc6de13013dfb4e5459 SHA512 53df3d52a9d26a725a10ea486408ab2b27b75c310011988de4b22fe87b40a8ec09e2e03d7b0404d4b045be401381366bba840bd3be0ab7a72dab38293a92927a WHIRLPOOL 80db6485d8845999cee55bf83f01dd02bb29c4755a1753b4ce9e56acddfb8ae434df79739aaffd2729eba23e822e3fea8cbfa4808a4803cfc8d6088861e64923
 MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVxexbAAoJEJGRpfGTSRu4lH4IAIpknt9j5FizSlSLfBHCVnps
-4d8g8ImUyNPhXrxK4IFr3AvpkhfH5UXuPN+fKlwikgUAodQvlZMmULEEGIDmafb3
-J1O7F1Z8ub0hYIJobl8wCgtElv5f772yuUJUcPc0LPtA1hQPSuX7UAtp7+eRYrnA
-kF6I1X3twnHddU9w89kKpdweDssXYtNY9i3SiUMyKmHWJXr0jn0hA1adyIePmsOe
-Yzg3KkjKcGwEtM03zwrAZyW8QsoKN/mDNF0au2ghWco3jBRcJNNbwO/WymOnhbVm
-eA2ij6nNlyUo8wtPT61Oub0m2WPE5J2OmXPJVLoxU40usKpNIJd5TgOpq/MtFVA=
-=Snr1
+iQEcBAEBCAAGBQJVxeykAAoJEJGRpfGTSRu4C0EH/RrBywFkt3dTHbpTJFPq8ru2
+mYg5Vnww45zmCjUY76YWPP22nMTznHUGvZUu20cf5B4/gAjqJ2Uc+mYCcGMxug1v
+ki0Hk05Bivy4MQl708vSpJ2YeZ0Q/10VfKmibQzOC5Y3LPKVgzgDhVf1SzKfLoKM
+SsG5vtblXSe/QOyjuVZxi2+wg70dQGOu9oxQyzwZGOVd4Z7nJ7NUhm5BST+wcsvN
+gIzAmnaQWccLKa0w+YmmKxvuFsJUoaeoX2Q34ZteEV7gJY8vzJF8BV2olqwdqViW
+MSz4iJCB2x51tEiGekm4qaqX54z7jkdJpX281pmTsJQjQxPaBR/BispBXby9xYM=
+=08kb
 -----END PGP SIGNATURE-----
diff --git a/dev-java/tablelayout/tablelayout-1.0.ebuild b/dev-java/tablelayout/tablelayout-1.0.ebuild
index 018a3d8cf5ed..5f6da95cf1ba 100644
--- a/dev-java/tablelayout/tablelayout-1.0.ebuild
+++ b/dev-java/tablelayout/tablelayout-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tablelayout/tablelayout-1.0.ebuild,v 1.1 2015/08/08 10:47:05 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tablelayout/tablelayout-1.0.ebuild,v 1.2 2015/08/08 10:48:07 monsieurp Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ DESCRIPTION="Layout manager that makes creating user interfaces fast and easy"
 HOMEPAGE="https://tablelayout.dev.java.net/"
 SRC_URI="http://www.oracle.com/technetwork/java/${PN}.jar"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-java/tablelayout/tablelayout-20090826.ebuild b/dev-java/tablelayout/tablelayout-20090826.ebuild
deleted file mode 100644
index 83d12267f01c..000000000000
--- a/dev-java/tablelayout/tablelayout-20090826.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tablelayout/tablelayout-20090826.ebuild,v 1.2 2015/04/02 18:19:37 mr_bones_ Exp $
-
-EAPI=5
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="TableLayout is a powerful layout manager"
-HOMEPAGE="https://java.net/projects/tablelayout/"
-SRC_URI="https://java.net/projects/tablelayout/downloads/download/Everything-2009-08-26.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-		app-arch/unzip"
-
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	unzip TableLayout-src-2009-08-26.jar -d src || die
-	rm *.jar || die
-}