diff --git a/trunk/novell4gentoo/app-admin/novell-groupwise-admin/Manifest b/trunk/novell4gentoo/app-admin/novell-groupwise-admin/Manifest
index e9a29906..742228e4 100644
--- a/trunk/novell4gentoo/app-admin/novell-groupwise-admin/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-groupwise-admin/Manifest
@@ -1,8 +1,4 @@
 DIST gw7.0.3HP_full_linux_multi.tar.gz 512726793 RMD160 9634355a484d4a72f5b063b7042f11750cc07495 SHA1 f123b8b789956784fe3a6ba7e787b9f5166f4c4f SHA256 82d21ba2ae047fabfee09e1a7c0edf9b69574b028b55a2d362aaa851a65e6fbd
-DIST gw702HP1alnxmulti.tar.gz 410842413 RMD160 81bb866455ae56fe256ea2a602dc81ee83d2fc9b SHA1 7b30cbbfa669322bdb289ad3e2ff8987fe0ecd7a SHA256 b53be14ff286a2f66e68f56f311a32206648d8a8f6412a0a21233e08f52a9ac7
-DIST gw703HP1_full_lnx_multi.tar.gz 508263381 RMD160 53275dfc1d14e5fe6fc0d89ab4a3b2e9c6ce037c SHA1 4031bb63769e200573eaf0dd23dbb27b679e6bdf SHA256 b485714e525c8f510617b7960d615131724e83fdfcae2218b9a95a38a835af86
-EBUILD novell-groupwise-admin-7.0.2_p20070606.ebuild 3423 RMD160 ac22aa2e832647a92f6ccf15977cfab30f50fd38 SHA1 e399c310720fe7002b11f854538f7d4daf388e51 SHA256 727807185a07684dc105a858c0113e119eb9d16dae0e0a603c79ffc7428a7940
-EBUILD novell-groupwise-admin-7.0.3_p20080609.ebuild 3363 RMD160 2d03394447244c0ca80100fbfb6f46be679a71f9 SHA1 5725158d18fd993435d4a259e66f15079fa4625c SHA256 954dbe0432307272fdb86bb53f9071c0f85f42a9087982d91241e96a6392812b
 EBUILD novell-groupwise-admin-7.0.3_p20090911.ebuild 3360 RMD160 6586552f550eb59fc4229e63f908e449187066e5 SHA1 68aa47d301985de4ca47bbdb1e974fd538121006 SHA256 b441f9168ca4090c7c4cdcf8589895aae90eb0952499cb3711162daeaef547fd
 MISC ChangeLog 731 RMD160 9c8c3bc3a87b8685b13085a2d090ecf21d89529d SHA1 fd9814d52a40b69213844e79ae3e98aa463bf29c SHA256 98271bf2467633678db78b2179166205e093a6e896ad5ca0ac8498439f317482
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.2_p20070606.ebuild b/trunk/novell4gentoo/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.2_p20070606.ebuild
deleted file mode 100644
index 3433fa72..00000000
--- a/trunk/novell4gentoo/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.2_p20070606.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NOVELL_BUILDID="dWjaKNZ0B-0~"
-NOVELL_FILE32="patchfiles/gw702HP1alnxmulti.tar.gz"
-RESTRICT="mirror strip"
-
-inherit novell eutils rpm java-utils-2
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Novell Groupwise Administration ConsoleOne Snapins"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}"
-
-LICENSE="Novell-eDir-87"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_it linguas_nl linguas_no linguas_pt linguas_sv"
-
-DEPEND=""
-
-RDEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=app-admin/novell-novlc1-1.3.6_p1"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack ${WORKDIR}/admin/${PN}-${MY_PV}.i386.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /usr/ConsoleOne/ConsoleOneExt
-        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/ConsoleOneExt/*.jar
-	java-pkg_jarinto /usr/ConsoleOne/snapins/GroupWise
-        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/snapins/GroupWise/*.jar
-	java-pkg_jarinto /usr/ConsoleOne/lib/GroupWise
-        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/GroupWise/*.jar
-	insinto /usr/ConsoleOne/help
-        doins -r ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/help/*
-	into /usr/ConsoleOne
-	dolib.so ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/bin/*.so*
-	into /usr/ConsoleOne
-        dobin ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/bin/gwcheck*
-	insinto /usr/ConsoleOne/lib
-        doins ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/bin/*.fil
-        doins ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/bin/*.xml
-	doman ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/man*/*.*
-        use linguas_da && doman -i18n=da ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/da/*/*.*
-        use linguas_de && doman -i18n=de ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/de/*/*.*
-        use linguas_es && doman -i18n=es ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/es/*/*.*
-        use linguas_fi && doman -i18n=fi ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/fi/*/*.*
-        use linguas_fr && doman -i18n=fr ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/fr/*/*.*
-        use linguas_it && doman -i18n=it ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/it/*/*.*
-        use linguas_nl && doman -i18n=nl ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/nl/*/*.*
-        use linguas_no && doman -i18n=no ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/no/*/*.*
-        use linguas_pt && doman -i18n=pt ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/pt/*/*.*
-        use linguas_sv && doman -i18n=sv ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/sv/*/*.*
-}
-
-pkg_nofetch() {
-    einfo "This files require you to register at ${HOMEPAGE} (free account)"
-    einfo "Please download following file:"
-    einfo " - ${NOVELL_FILE32}"
-    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-    einfo "and place it in ${DISTDIR}"
-    einfo ""
-    einfo "To get rid of downloading files from ${HOMEPAGE}"
-    einfo "you can create a file /etc/portage/novell.acc"
-    einfo "containing the novell account infos with following commands"
-    einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
-    einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
-}
diff --git a/trunk/novell4gentoo/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.3_p20080609.ebuild b/trunk/novell4gentoo/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.3_p20080609.ebuild
deleted file mode 100644
index 852c9bc4..00000000
--- a/trunk/novell4gentoo/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.3_p20080609.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NOVELL_BUILDID="ey8-Qy-Vwio~/"
-NOVELL_FILE32="patchfiles/gw703HP1_full_lnx_multi.tar.gz"
-RESTRICT="mirror strip"
-
-inherit novell eutils rpm java-utils-2
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Novell Groupwise Administration ConsoleOne Snapins"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}"
-
-LICENSE="Novell-eDir-87"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_it linguas_nl linguas_no linguas_pt linguas_sv"
-
-DEPEND=""
-
-RDEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=app-admin/novell-novlc1-1.3.6_p1"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack "${WORKDIR}"/admin/${PN}-${MY_PV}.i386.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	has_multilib_profile && ABI="x86"
-
-	java-pkg_jarinto /usr/ConsoleOne/ConsoleOneExt
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/ConsoleOneExt/*.jar
-	java-pkg_jarinto /usr/ConsoleOne/snapins/GroupWise
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/GroupWise/*.jar
-	java-pkg_jarinto /usr/ConsoleOne/lib/GroupWise
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/lib/GroupWise/*.jar
-	insinto /usr/ConsoleOne/help
-	doins -r "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/help/*
-	into /usr/ConsoleOne
-	dolib.so "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/bin/*.so*
-	into /usr/ConsoleOne
-	dobin "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/bin/gwcheck*
-	insinto /usr/ConsoleOne/lib
-	doins "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/bin/*.fil
-	doins "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/bin/*.xml
-	doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/man*/*.*
-	use linguas_da && doman -i18n=da "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/da/*/*.*
-	use linguas_de && doman -i18n=de "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/de/*/*.*
-	use linguas_es && doman -i18n=es "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/es/*/*.*
-	use linguas_fi && doman -i18n=fi "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/fi/*/*.*
-	use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/fr/*/*.*
-	use linguas_it && doman -i18n=it "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/it/*/*.*
-	use linguas_nl && doman -i18n=nl "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/nl/*/*.*
-	use linguas_no && doman -i18n=no "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/no/*/*.*
-	use linguas_pt && doman -i18n=pt "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/pt/*/*.*
-	use linguas_sv && doman -i18n=sv "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/sv/*/*.*
-}
-
-pkg_nofetch() {
-	einfo "This files require you to register at ${HOMEPAGE} (free account)"
-	einfo "Please download following file:"
-	einfo " - ${NOVELL_FILE32}"
-	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-	einfo "and place it in ${DISTDIR}"
-	einfo ""
-	einfo "To get rid of downloading files from ${HOMEPAGE}"
-	einfo "you can create a file /etc/portage/novell.acc"
-	einfo "containing the novell account infos with following commands"
-	einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
-	einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
-}