enewuser/enewgroup die on their own, no need to || die. Fixed quotation.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686

3 files changed, 19 insertions, 16 deletions

diff --git a/dev-db/xindice/ChangeLog b/dev-db/xindice/ChangeLog
index 5072eb8ff4ac..da856e962845 100644
--- a/dev-db/xindice/ChangeLog
+++ b/dev-db/xindice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/xindice
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.15 2007/04/09 11:36:15 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.16 2008/09/11 06:56:03 pva Exp $
+
+  11 Sep 2008; Peter Volkov <pva@gentoo.org> xindice-1.0-r4.ebuild:
+  enewuser/enewgroup die on their own, no need to || die. Fixed quotation.
 
   09 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -xindice-1.0-r3.ebuild:
   Remove old version.
diff --git a/dev-db/xindice/Manifest b/dev-db/xindice/Manifest
index 7c0252001d89..e86265ad8564 100644
--- a/dev-db/xindice/Manifest
+++ b/dev-db/xindice/Manifest
@@ -2,6 +2,6 @@ AUX 21xindice 26 RMD160 649b13143951d891bed89ee330a62b4435e44bf2 SHA1 cb03207202
 AUX xindice-1.0-r3.patch 1309 RMD160 aa6b4255b925e38d2f460e135b1ebf511c36b1e3 SHA1 3bf8c05028fef6a315efc335c3bfbcdcdfd3f927 SHA256 3b73c064ecd9a2df47e9513f19e84cde98c6c4a88d373bf0c2a9267e9ec4ff28
 AUX xindice-r2 579 RMD160 275f6e3c11a298e1d48e5222948db0ec56ae3672 SHA1 abe7e48c75916622d542dc94b20c467489e21fd3 SHA256 ebace595fc76ef85101bfe06eff8abb51c221a6b99d05053b08dcd66b113908f
 DIST xml-xindice-1.0.tar.gz 5304315 RMD160 1253aa693340cd3c7d5210050adb53cf842069f3 SHA1 ec3bc46800549de687cb4552882719598f0df923 SHA256 d81c418dacc86d5cfa66c422e12a2438280b784150d99152e7bd287ab3403cb1
-EBUILD xindice-1.0-r4.ebuild 1602 RMD160 58f69d762227da54bdf61b26aa9ecf0d8e89d7f2 SHA1 8d5518b6b53ca937686fd516cdc0db317fd36661 SHA256 79342c63571198a4e03da604f1f81de939fd554ab6312313be22122ea416c9d2
-MISC ChangeLog 2885 RMD160 05838a2ca82f6085fc43f409f4283cfbb4a65617 SHA1 655205f19178f02c6521c89cb4fa2a5b1b4af175 SHA256 024c3c0de37fea2becd7a77cfccb0279a42c5f581ddaf778ab8287e5d5e9dcc0
+EBUILD xindice-1.0-r4.ebuild 1542 RMD160 23abe2c7a156c560c8fced11ba5f38c6d0e5bbe1 SHA1 e928e64f1703e830fc82d5b2427e3ab0ea839e9f SHA256 5d6c51d111f1e7d721ec79fbfb2f69a22bd254ce99be3af26edaf5759c5f78c8
+MISC ChangeLog 3022 RMD160 b13e9e70e2965406a75ca89417368f4280cc44f8 SHA1 65e6f981e9849a5f7a25a35b42b401e33f0f2507 SHA256 7290bb6b460a3236194966d11f1b45840fd8e36759b327e3b56930573743d9b7
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-db/xindice/xindice-1.0-r4.ebuild b/dev-db/xindice/xindice-1.0-r4.ebuild
index 55a20ad6d876..47b8750a2116 100644
--- a/dev-db/xindice/xindice-1.0-r4.ebuild
+++ b/dev-db/xindice/xindice-1.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r4.ebuild,v 1.4 2007/04/09 11:35:09 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r4.ebuild,v 1.5 2008/09/11 06:56:03 pva Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -21,16 +21,16 @@ RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )"
 S=${WORKDIR}/xml-${P}
 
 pkg_setup() {
-	enewgroup ${PN} || die "Adding group ${PN} failed"
-	enewuser ${PN} -1 /bin/sh /var/run/${PN} ${PN} || die "Adding user ${PN} failed"
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/sh /var/run/${PN} ${PN}
 
 	java-pkg-2_pkg_setup
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-r3.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-r3.patch
 }
 
 src_compile() {
@@ -41,19 +41,19 @@ src_compile() {
 src_install() {
 	export TARGET=/opt/${PN}
 	keepdir /var/run/${PN}
-	chown ${PN}:${PN} ${D}/var/run/${PN}
+	chown ${PN}:${PN} "${D}"/var/run/${PN}
 	dodir ${TARGET}
 	dodir ${TARGET}/java
-	cp -pPR bin config icons docs logs idl ${D}${TARGET}
+	cp -pPR bin config icons docs logs idl "${D}"${TARGET}
 	cd java
-	cp -pPR lib tests examples ${D}${TARGET}/java
+	cp -pPR lib tests examples "${D}"${TARGET}/java
 	cd ..
 	dodoc docs/LICENSE docs/README docs/FAQ docs/TODO docs/VERSIONS docs/AUTHORS
 	dohtml docs/AdministratorsGuide.html docs/DevelopersGuide.html docs/UsersGuide.html docs/ToolsReference.html docs/feather.gif docs/index.html docs/xindice.jpg
-	doenvd ${FILESDIR}/21${PN}
-	newinitd ${FILESDIR}/${PN}-r2 ${PN}
+	doenvd "${FILESDIR}"/21${PN}
+	newinitd "${FILESDIR}"/${PN}-r2 ${PN}
 	insinto ${TARGET}
 	doins start
 	keepdir /opt/${PN}/db
-	chown -R ${PN}:${PN} ${D}/opt/${PN}
+	chown -R ${PN}:${PN} "${D}"/opt/${PN}
 }