improve ebuild quality, fix improper usage of || die

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 27 insertions, 32 deletions

diff --git a/app-admin/389-ds-console/389-ds-console-1.2.3.ebuild b/app-admin/389-ds-console/389-ds-console-1.2.3.ebuild
index d3768b6e7f06..ec7bfac0415c 100644
--- a/app-admin/389-ds-console/389-ds-console-1.2.3.ebuild
+++ b/app-admin/389-ds-console/389-ds-console-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/389-ds-console-1.2.3.ebuild,v 1.1 2010/07/10 14:27:35 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/389-ds-console-1.2.3.ebuild,v 1.2 2010/07/10 19:57:02 lxnay Exp $
 
 EAPI="2"
 
@@ -8,11 +8,12 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils versionator
 
-MY_V=${PV}
+MY_PV=${PV/_alpha/.a}
+MY_PV=${MY_PV/_rc/.rc}
 MY_MV="$(get_version_component_range 1-2)"
 
-DESCRIPTION="A Java based remote management console used for Managing 389 Administration and Directory Server."
-HOMEPAGE="http://port389.org/"
+DESCRIPTION="Java based remote management console used for Managing 389-admin 389-ds"
+HOMEPAGE="http://directory.fedoraproject.org"
 SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -23,14 +24,13 @@ IUSE=""
 COMMON_DEP="dev-java/jss:3.4
 	dev-java/ldapsdk:4.1
 	>=dev-java/idm-console-framework-1.1"
-
 RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.6
 	${COMMON_DEP}"
 
 src_prepare() {
-	# gentoo java rules say no jars with version number
+	# Gentoo java rules say no jars with version number
 	# so sed away the version indicator '-'
 	sed -e "s!-\*!\*!g" -i build.xml || die "sed failed"
 
@@ -43,39 +43,30 @@ src_compile() {
 	eant -Dbuilt.dir="${S}"/build \
 	     -Dldapjdk.location="${S}" \
 	     -Djss.location="${S}" \
-	     -Dconsole.location="${S}" ${antflags} || die "eant failed"
-
-	if use doc;then
-		eant -Dbuilt.dir="${S}"/build \
+	     -Dconsole.location="${S}" ${antflags}
+	use doc && eant -Dbuilt.dir="${S}"/build \
 	     -Dldapjdk.location="${S}" \
 	     -Djss.location="${S}" \
-	     -Dconsole.location="${S}" ${antflags} javadoc \
-		 				|| die "eant javadoc failed"
-	fi
+	     -Dconsole.location="${S}" ${antflags} javadoc
 }
 
 src_install() {
 	java-pkg_jarinto /usr/share/dirsrv/html/java
-	java-pkg_newjar "${S}"/build/package/389-ds-${MY_V}.jar 389-ds-${MY_V}.jar
-	java-pkg_newjar "${S}"/build/package/389-ds-${MY_V}_en.jar 389-ds-${MY_V}_en.jar
+	java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}.jar 389-ds-${MY_PV}.jar
+	java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}_en.jar 389-ds-${MY_PV}_en.jar
 
-	dosym 389-ds-${MY_V}.jar /usr/share/dirsrv/html/java/389-ds.jar
-	dosym 389-ds-${MY_V}_en.jar /usr/share/dirsrv/html/java/389-ds_en.jar
-	dosym 389-ds-${MY_V}.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}.jar
-	dosym 389-ds-${MY_V}_en.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}_en.jar
+	dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds.jar
+	dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds_en.jar
+	dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}.jar
+	dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}_en.jar
 
 	insinto /usr/share/dirsrv/manual/en/slapd
-	doins "${S}"/help/en/*.html || die
-	doins "${S}"/help/en/tokens.map || die
+	doins "${S}"/help/en/*.html
+	doins "${S}"/help/en/tokens.map
 
 	insinto /usr/share/dirsrv/manual/en/slapd/help
-	doins "${S}"/help/en/help/*.html || die
-
-	if use doc; then
-		java-pkg_dojavadoc build/doc || die
-	fi
+	doins "${S}"/help/en/help/*.html
 
-	if use source; then
-		java-pkg_dosrc src/com || die
-	fi
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc src/com
 }
diff --git a/app-admin/389-ds-console/ChangeLog b/app-admin/389-ds-console/ChangeLog
index d882d8d15440..eee69613c942 100644
--- a/app-admin/389-ds-console/ChangeLog
+++ b/app-admin/389-ds-console/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/389-ds-console
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/ChangeLog,v 1.1 2010/07/10 14:27:35 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/ChangeLog,v 1.2 2010/07/10 19:57:02 lxnay Exp $
+
+  10 Jul 2010; Fabio Erculiani <lxnay@gentoo.org>
+  389-ds-console-1.2.3.ebuild:
+  improve ebuild quality, fix improper usage of die
 
 *389-ds-console-1.2.3 (07 Jul 2010)
 
diff --git a/app-admin/389-ds-console/Manifest b/app-admin/389-ds-console/Manifest
index 117d8837adaf..feafe3188f3b 100644
--- a/app-admin/389-ds-console/Manifest
+++ b/app-admin/389-ds-console/Manifest
@@ -1,4 +1,4 @@
 DIST 389-ds-console-1.2.3.tar.bz2 786681 RMD160 4b6a496b38c661bdecffd8fc91b803cc2aa6e4fd SHA1 9d433a142a92c7b6a2cc46927dba4140da05810b SHA256 a866e4cbef6445d8540b250c0f4ea9617501f6ea1b9c183b4745455bb59eefed
-EBUILD 389-ds-console-1.2.3.ebuild 2363 RMD160 eb644e0094a3905d660d75eae02c63f8ea729da9 SHA1 9353fe0711dceaf09433a1bb833026aac66139ab SHA256 6abe9354d13c20f140612acce0cb5fcaba8b628c607ee3ce852d8c6e33c9810d
-MISC ChangeLog 471 RMD160 1b9dea20ac4272ffe65a9d9f06dab42fcaf299d8 SHA1 14c1f3e9f1cbe01ae0a483c65459f6e2b15c2272 SHA256 8a5b8b7682747eb83ffa03edcd8aa30c63fc871e5a95bfe36beb21602f11a298
+EBUILD 389-ds-console-1.2.3.ebuild 2262 RMD160 82cdcbd8453c38c802545e7dd1b086ee55d091e6 SHA1 ca38182072c111fe3b3b28f662da12f573bbefdc SHA256 671dae1f2e9be4168b60f98b67ec95e860a14f440f897826424e15193e367678
+MISC ChangeLog 605 RMD160 ecfff80f85b155f56cc4b0ef9b2c104e761db9d7 SHA1 18819518ca5b7315fdcf30c82d5190541b5ee41b SHA256 73834fd5750a6987a3e91651817d45093d4302b4e7fb05e02f2e7eaf394cf566
 MISC metadata.xml 227 RMD160 92fc89f59a94250ee081e799a46739c0ac755e25 SHA1 5285a0ccf4ac3c5b867bb1c2eba7e8e7f22d9008 SHA256 3f9174062589ce0ed475ead0c924b5140e0d0731d5386da89efbe27576853ab9