edos2unix dies on its own.

(Portage version: 2.1.11.9/cvs/Linux i686)

4 files changed, 22 insertions, 22 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 4b7330326b24..43c6daee96dd 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.61 2012/10/01 16:31:11 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.62 2012/11/07 17:52:23 billie Exp $
+
+  07 Nov 2012; Daniel Pielmeier <billie@gentoo.org> projectx-0.91.0.02.ebuild,
+  projectx-0.91.0.03.ebuild, projectx-0.91.0.04.ebuild:
+  edos2unix dies on its own.
+
+  07 Nov 2012; Daniel Pielmeier <billie@gentoo.org> projectx-0.91.0.02.ebuild,
+  projectx-0.91.0.03.ebuild, projectx-0.91.0.04.ebuild:
+  Adress remarks from Chema Alonso in bug #441416. Remove elog warning about
+  confid change (two years should be enough).
 
 *projectx-0.91.0.04 (01 Oct 2012)
 
diff --git a/media-video/projectx/projectx-0.91.0.02.ebuild b/media-video/projectx/projectx-0.91.0.02.ebuild
index 13b55915850b..bfe61b4ad8f0 100644
--- a/media-video/projectx/projectx-0.91.0.02.ebuild
+++ b/media-video/projectx/projectx-0.91.0.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.91.0.02.ebuild,v 1.5 2012/03/08 23:03:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.91.0.02.ebuild,v 1.6 2012/11/07 17:52:23 billie Exp $
 
 EAPI=4
 
@@ -54,7 +54,7 @@ java_prepare() {
 	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-idctfast.patch"
 
 	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java"
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
 	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-xdg.patch"
 
 	# copy build.xml
@@ -83,7 +83,7 @@ java_prepare() {
 	fi
 
 	# update library packages
-	cd lib
+	cd lib || die
 	rm -f {commons-net,jakarta-oro}*.jar || die
 	java-pkg_jar-from commons-net
 	use X && java-pkg_jar-from browserlauncher2-1.0
@@ -99,7 +99,7 @@ src_compile() {
 
 	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
 
-	cd lib/PORTABLE
+	cd lib/PORTABLE || die
 	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
 		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
 }
diff --git a/media-video/projectx/projectx-0.91.0.03.ebuild b/media-video/projectx/projectx-0.91.0.03.ebuild
index ce7c088ab0b0..e1bb17e7bd84 100644
--- a/media-video/projectx/projectx-0.91.0.03.ebuild
+++ b/media-video/projectx/projectx-0.91.0.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.91.0.03.ebuild,v 1.3 2012/09/23 08:05:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.91.0.03.ebuild,v 1.4 2012/11/07 17:52:23 billie Exp $
 
 EAPI=4
 
@@ -54,7 +54,7 @@ java_prepare() {
 	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-idctfast.patch"
 
 	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java"
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
 	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-xdg.patch"
 
 	# copy build.xml
@@ -83,7 +83,7 @@ java_prepare() {
 	fi
 
 	# update library packages
-	cd lib
+	cd lib || die
 	rm -f {commons-net,jakarta-oro}*.jar || die
 	java-pkg_jar-from commons-net
 	use X && java-pkg_jar-from browserlauncher2-1.0
@@ -99,7 +99,7 @@ src_compile() {
 
 	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
 
-	cd lib/PORTABLE
+	cd lib/PORTABLE || die
 	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
 		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
 }
diff --git a/media-video/projectx/projectx-0.91.0.04.ebuild b/media-video/projectx/projectx-0.91.0.04.ebuild
index 782a7518da87..2913203a5dd0 100644
--- a/media-video/projectx/projectx-0.91.0.04.ebuild
+++ b/media-video/projectx/projectx-0.91.0.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.91.0.04.ebuild,v 1.1 2012/10/01 16:31:11 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.91.0.04.ebuild,v 1.2 2012/11/07 17:52:23 billie Exp $
 
 EAPI=4
 
@@ -54,7 +54,7 @@ java_prepare() {
 	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-idctfast.patch"
 
 	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java"
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
 	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-xdg.patch"
 
 	# copy build.xml
@@ -83,7 +83,7 @@ java_prepare() {
 	fi
 
 	# update library packages
-	cd lib
+	cd lib || die
 	rm -f {commons-net,jakarta-oro}*.jar || die
 	java-pkg_jar-from commons-net
 	use X && java-pkg_jar-from browserlauncher2-1.0
@@ -99,7 +99,7 @@ src_compile() {
 
 	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
 
-	cd lib/PORTABLE
+	cd lib/PORTABLE || die
 	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
 		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
 }
@@ -125,12 +125,3 @@ src_install() {
 	use doc && java-pkg_dojavadoc apidocs
 	use source && java-pkg_dosrc src
 }
-
-pkg_postinst() {
-	elog "Default config file and location has changed!"
-	elog
-	elog "It is now located at \$XDG_CONFIG_HOME/Project-X.ini"
-	elog "You should move your old X.ini into the new location."
-	elog
-	elog "Hint: \$XDG_CONFIG_HOME defaults to ~/.config"
-}