Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo

8 files changed, 8 insertions, 108 deletions

diff --git a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
index 220b23be84c..1c836c034f3 100644
--- a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
+++ b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3"
 DEPEND="${REPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
index 13a9381b614..2d9eaa5cc0b 100644
--- a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 x86"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
 
diff --git a/dev-java/istack-commons-tools/Manifest b/dev-java/istack-commons-tools/Manifest
index 35a4f6433de..304b54276a2 100644
--- a/dev-java/istack-commons-tools/Manifest
+++ b/dev-java/istack-commons-tools/Manifest
@@ -1,3 +1 @@
-DIST istack-commons-20070122.tar.bz2 10360 SHA256 dc8c86bb11f7ddd4c1c50ca0925d59ade16b5dc74bcd983fe95a08e104662a8e SHA512 120b9b8db52cebe507e8711dd4fcdc1a12db8d2320ff9054e1fa6688a321cbb18d25f6beb06e11a091c1cbc2870ab07e9df9681784893c5f0d6f36ae4b7e12f6 WHIRLPOOL b4d47b9d73ecd26c2effd287642521d8ecd6741c6df140bd024aa54770ddf1084d504ade53505e27dda66e3204e2625dcb63c40df1d098e4baed76f5371a55ee
-DIST istack-commons-20090620-src.tar.bz2 30194 SHA256 0719fbc462f98bfb66e9606fad11845797a2ba7dd54ad780e07e16c63f3ea899 SHA512 8a037852a19dd8ecf66fd6b6ca1454503e9f3d36ee716d774a1eb70245a60cf21c7e14ae97d811953d68475c4ea9bef7b9470d0ab82363481dc0f71c2865d2d4 WHIRLPOOL 68f8427892ff95390bf418c874dccd84aefe5c04f26e40b42f1f3e6fbe85a81f695365c1ff3b34eab0a4ebf42476301434555ed43d556f39f597bcd4c6861630
 DIST istack-commons-tools-2.22-sources.jar 15106 SHA256 8287f624b188dd70551907728deb9fd73c9e4bf4362458e6c2e84b6ff626a1c3 SHA512 daded38bcc64a8639813e607126867a515cf26c57b709062e32dc1c507e02f1592e496d028dbb36fb40e1aa04a82fb8c1a94d66818fed6680a32790a4a9b802f WHIRLPOOL 881e528c81f636a40de81491a5b5f106af42b7b8dfb709339f23c2626e54a522c0394dc3bca7477e2e437e62592ce9f0f7c70dae1de6d8b7ebec3aa73ae17621
diff --git a/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild b/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild
index e64fb18e4b0..bcb2f766450 100644
--- a/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild
+++ b/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/$
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/istack-commons-tools/istack-commons-tools-20070122-r1.ebuild b/dev-java/istack-commons-tools/istack-commons-tools-20070122-r1.ebuild
deleted file mode 100644
index ed508501f40..00000000000
--- a/dev-java/istack-commons-tools/istack-commons-tools-20070122-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="istack-commons - tools"
-HOMEPAGE="https://istack-commons.dev.java.net/"
-SRC_URI="mirror://gentoo/istack-commons-${PV}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/istack-commons-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	cd "${S}/tools"
-	mkdir -p lib || die
-
-	ln -s $(java-config --tools) lib || die
-}
-
-EANT_BUILD_XML="tools/build.xml"
-
-src_install() {
-
-	java-pkg_dojar tools/build/istack-commons-tools.jar
-
-	use source && java-pkg_dosrc tools/src/*
-
-}
diff --git a/dev-java/istack-commons-tools/istack-commons-tools-20090620.ebuild b/dev-java/istack-commons-tools/istack-commons-tools-20090620.ebuild
deleted file mode 100644
index 5c41ff09d93..00000000000
--- a/dev-java/istack-commons-tools/istack-commons-tools-20090620.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="istack-commons - tools"
-HOMEPAGE="https://istack-commons.dev.java.net/"
-PROJ_PN="istack-commons"
-PROJ_P="${PROJ_PN}-${PV}"
-SRC_FILE="${PROJ_P}-src.tar.bz2"
-SRC_URI="mirror://gentoo/${SRC_FILE}"
-
-LICENSE="CDDL"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PROJ_P}"
-
-# Helper to generate the tarball :-)
-# ( PN=istack-commons-runtime ; PV=20090620 ; P="${PN}-${PV}" ; . ${P}.ebuild  ; src_tarball )
-src_tarball() {
-	CVSROOT=':pserver:guest@cvs.dev.java.net:/cvs'
-	PROJ_PN='istack-commons'
-	cvs -d "${CVSROOT}" \
-		export -D $PV -d "${PROJ_P}" \
-		"${PROJ_PN}/${PROJ_PN}" && \
-	tar cvjf "${SRC_FILE}" \
-		--exclude '*.zip' \
-		--exclude '*.jar' \
-		"${PROJ_P}" \
-		&& \
-	echo "New tarball located at ${SRC_FILE}"
-}
-
-java_prepare() {
-	java-ant_bsfix_one "${S}/build-common.xml"
-	cd "${S}/tools"
-	mkdir -p lib || die
-	ln -s $(java-config --tools) lib || die
-	java-pkg_jar-from --build-only --into "${S}"/tools/lib ant-core ant.jar
-}
-
-EANT_BUILD_XML="tools/build.xml"
-
-src_install() {
-
-	java-pkg_dojar tools/build/istack-commons-tools.jar
-
-	use source && java-pkg_dosrc tools/src/*
-
-}
diff --git a/sys-process/ftop/ftop-1.0.ebuild b/sys-process/ftop/ftop-1.0.ebuild
index 979f38c546e..85f73fa31e0 100644
--- a/sys-process/ftop/ftop-1.0.ebuild
+++ b/sys-process/ftop/ftop-1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
diff --git a/sys-process/ftop/metadata.xml b/sys-process/ftop/metadata.xml
index 4a00a64b40a..eda802e560c 100644
--- a/sys-process/ftop/metadata.xml
+++ b/sys-process/ftop/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>