version bump, fixes Gentoo bug #371633, drop older releases

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 13 insertions, 82 deletions

diff --git a/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild b/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild
deleted file mode 100644
index dd0537f7fa43..000000000000
--- a/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild,v 1.2 2010/10/17 10:09:12 lxnay Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV=${PV/_alpha/.a}
-MY_PV=${MY_PV/_rc/.rc}
-
-DESCRIPTION="389 Server Management Console (jar and help files)"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jss:3.4
-	dev-java/ldapsdk:4.1
-	>=dev-java/idm-console-framework-1.1"
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 )
-	${COMMON_DEP}"
-DEPEND="sys-apps/sed
-	>=virtual/jdk-1.5
-	${COMMON_DEP}"
-PDEPEND="net-nds/389-admin"
-
-src_prepare() {
-	# Gentoo java rules say no jars with version number
-	# so sed away the version indicator '-'
-	sed -e "s!-\*!\*!g" -i build.xml
-
-	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
-	java-pkg_jar-from jss-3.4 xpclass.jar jss4.jar
-	java-pkg_jar-from idm-console-framework-1.1
-}
-
-src_compile() {
-	eant -Dbuilt.dir="${S}"/build \
-	     -Dldapjdk.location="${S}" \
-	     -Djss.location="${S}" \
-	     -Dconsole.location="${S}" ${antflags}
-	use doc && eant -Dbuilt.dir="${S}"/build \
-	     -Dldapjdk.location="${S}" \
-	     -Djss.location="${S}" \
-	     -Dconsole.location="${S}" ${antflags} javadoc
-}
-
-src_install() {
-	java-pkg_jarinto /usr/share/dirsrv/html/java
-	# have to install versioned jars, otherwise 389-console will crash
-	java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}.jar 389-admin-${MY_PV}.jar
-	java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}_en.jar 389-admin-${MY_PV}_en.jar
-
-	dosym 389-admin-${MY_PV}.jar /usr/share/dirsrv/html/java/389-admin.jar
-	dosym 389-admin-${MY_PV}.jar /usr/share/dirsrv/html/java/389-admin-${SLOT}.jar
-	dosym 389-admin-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-admin_en.jar
-	dosym 389-admin-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-admin-${SLOT}_en.jar
-
-	insinto /usr/share/dirsrv/manual/en/admin
-	doins "${S}"/help/en/*.html
-	doins "${S}"/help/en/tokens.map
-
-	insinto /usr/share/dirsrv/manual/en/admin/help
-	doins "${S}"/help/en/help/*.html
-
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc src/com
-}
diff --git a/app-admin/389-admin-console/389-admin-console-1.1.5.ebuild b/app-admin/389-admin-console/389-admin-console-1.1.7.ebuild
index 24a3bd65b845..811145f33017 100644
--- a/app-admin/389-admin-console/389-admin-console-1.1.5.ebuild
+++ b/app-admin/389-admin-console/389-admin-console-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/389-admin-console-1.1.5.ebuild,v 1.1 2011/01/11 22:25:07 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/389-admin-console-1.1.7.ebuild,v 1.1 2011/06/14 19:01:03 lxnay Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ IUSE=""
 
 COMMON_DEP="dev-java/jss:3.4
 	dev-java/ldapsdk:4.1
-	>=dev-java/idm-console-framework-1.1"
+	>=dev-java/idm-console-framework-1.1.7"
 RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 )
 	${COMMON_DEP}"
 DEPEND="sys-apps/sed
diff --git a/app-admin/389-admin-console/ChangeLog b/app-admin/389-admin-console/ChangeLog
index 66c5dd3c2167..45dd1cd1fac7 100644
--- a/app-admin/389-admin-console/ChangeLog
+++ b/app-admin/389-admin-console/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/389-admin-console
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/ChangeLog,v 1.5 2011/01/11 22:25:07 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/ChangeLog,v 1.6 2011/06/14 19:01:03 lxnay Exp $
+
+*389-admin-console-1.1.7 (14 Jun 2011)
+
+  14 Jun 2011; Fabio Erculiani <lxnay@gentoo.org>
+  +389-admin-console-1.1.7.ebuild, -389-admin-console-1.1.4-r1.ebuild,
+  -389-admin-console-1.1.5.ebuild:
+  version bump, fixes Gentoo bug #371633, drop older releases
 
 *389-admin-console-1.1.5 (11 Jan 2011)
 
diff --git a/app-admin/389-admin-console/Manifest b/app-admin/389-admin-console/Manifest
index 5a108ca86a0c..f22e00ce02fb 100644
--- a/app-admin/389-admin-console/Manifest
+++ b/app-admin/389-admin-console/Manifest
@@ -1,6 +1,4 @@
-DIST 389-admin-console-1.1.4.tar.bz2 125613 RMD160 8913f073c18bad77c148e7b304e1c145126b3ce2 SHA1 29a4ba674b4f532c67ed1303162e5b232bcf9821 SHA256 bf57f4dcd6f41d195ca7fff2f71663b8c394edf6c95d5778f78a0569436c5be4
-DIST 389-admin-console-1.1.5.tar.bz2 125912 RMD160 90c4d9ba3509d0e188231825cee76268731f4b71 SHA1 3baf33f3a045fafb6cd7157e448c9b8453f86721 SHA256 b7b37e7de527fb43b2316ef05e14447ab34a398465116c4a49416f97cd2ae6a8
-EBUILD 389-admin-console-1.1.4-r1.ebuild 2322 RMD160 e4e23c9229a771f6c8dc7971d220a619a1f2e811 SHA1 ddcb8253a5ce522391a57fd24d32fe5fc9bb27b7 SHA256 97180750877cc5874fb1ceb93f74abe2cade3870d3b0d5e02dd02e8410ef5d18
-EBUILD 389-admin-console-1.1.5.ebuild 2319 RMD160 cd34546481017e7fabae876719588d07613c5e1f SHA1 f630414bdd91a2822cb9877954d49fc0cf335fe1 SHA256 72d8d06b8e47efed8c7623f0159172e6585f55b5b0f96da85d24af1973ebf161
-MISC ChangeLog 1065 RMD160 66fad45040e353a9a3cb3264fffdafde258597ea SHA1 8ff34e54f3467d513efea3755d3434d00d7cd124 SHA256 a9b9de63894879f8f48c356235c3d84340845b55e94e5f61543a06476c417add
+DIST 389-admin-console-1.1.7.tar.bz2 126272 RMD160 166ede9d33cde6291a6f3719529c26e5732f6f89 SHA1 917db7c8b6f4390cbe688966826ac499d6d6cd75 SHA256 2590ffb33bf46c97641ee9d560e7332d3109702f9f1ebc997fbe819603f24fe1
+EBUILD 389-admin-console-1.1.7.ebuild 2321 RMD160 fdddab14fadf12f3a63f94179825094845c6772b SHA1 4f956bdee13ad59bb5e36f9706facd72eb6d110a SHA256 24ac9bc401d433cfedb8e600b48939a8515c142969923483a9147fec6ab14871
+MISC ChangeLog 1324 RMD160 3960bbcb826a08b189fd8445891831062f0ba38f SHA1 cd24ff641dd3409cc25a832424993980ffdd0ae7 SHA256 6452a1bb7109b83b0eb963675c10cf0ea682689cb277a395bf79675f6532dbb5
 MISC metadata.xml 1675 RMD160 bfbf38bb6cd7d354d5477c1a72c31f49b5573eb6 SHA1 6c46939d3c00aaef72128db92f19939fe13f4284 SHA256 f5c0a5568ad1122307f093d645f6b9d03676f004253292e39c8cfc799ab8c518