3 files changed, 7 insertions, 45 deletions
diff --git a/dev-java/jnr-unixsocket/ChangeLog b/dev-java/jnr-unixsocket/ChangeLog
index 4bddc68e8187..ab28dd1ffedc 100644
--- a/dev-java/jnr-unixsocket/ChangeLog
+++ b/dev-java/jnr-unixsocket/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jnr-unixsocket
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/ChangeLog,v 1.4 2015/06/06 18:48:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/ChangeLog,v 1.5 2015/06/17 17:14:09 monsieurp Exp $
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  -jnr-unixsocket-0.3.ebuild, jnr-unixsocket-0.6.ebuild:
+  Stable for x86+amd64 through ALLARCHES. Remove old. Fix bug 552362.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
deleted file mode 100644
index 4c4ca8e627b1..000000000000
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
+++ /dev/null
@@ -1,42 +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/jnr-unixsocket/jnr-unixsocket-0.3.ebuild,v 1.4 2015/04/16 13:34:32 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Unix sockets for Java"
-SRC_URI="http://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-enxio:0
-	dev-java/jnr-ffi:0.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-0.7"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/jnr
-	use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
index 1aa07e1cdd91..51f779cb2a27 100644
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
+++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.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/jnr-unixsocket/jnr-unixsocket-0.6.ebuild,v 1.1 2015/04/16 13:34:32 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild,v 1.2 2015/06/17 17:14:09 monsieurp Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 
 CDEPEND="dev-java/jnr-constants:0