app-misc/gpligc: Added missing die statements. Replaced dosed(deprecated/will be banned) by sed. Cleanup.

svn path=/sunrise/; revision=8404

3 files changed, 30 insertions, 30 deletions

diff --git a/app-misc/gpligc/ChangeLog b/app-misc/gpligc/ChangeLog
index 6cd5fb804..74a2c5586 100644
--- a/app-misc/gpligc/ChangeLog
+++ b/app-misc/gpligc/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Apr 2009; Christian Ruppert <idl0r@gentoo.org> gpligc-1.7.ebuild:
+  Added missing die statements. Replaced dosed(deprecated/will be banned) by
+  sed. Cleanup.
+
   22 Apr 2009; Srebrodolskite <Hannes.Krueger@gmail.com> -gpligc-1.6.ebuild,
   +gpligc-1.7.ebuild:
   Version bump for gpligc
diff --git a/app-misc/gpligc/Manifest b/app-misc/gpligc/Manifest
index ce1fbb81a..4f2616f22 100644
--- a/app-misc/gpligc/Manifest
+++ b/app-misc/gpligc/Manifest
@@ -1,4 +1,4 @@
-DIST GPLIGC-1.7-src.tar.gz 990063 RMD160 fb9e3f436731675249fbf5ed4cc6d4dc983fb94e SHA1 7a7b22e4d0d4c79f6b4baffc72f31a674c012956 SHA256 6b2f81ab4b12e02edb574a0adb7a3868fce203794994e448265bef11d00bf69f
-EBUILD gpligc-1.7.ebuild 2349 RMD160 f63e651539e07bbd76306beecb763b94e9983f5c SHA1 98e62b4a957b140cb3344197888dd2a000a8d1ce SHA256 9030be635c903dab93d207b8fe7258d97831b63b5f46696ca2ff29992dcb5364
-MISC ChangeLog 920 RMD160 3ef61138f86e355c341e5cef6d57485dd2f259e4 SHA1 d4904d63407c17e7a7fd06dc6814e2a2e43a2ba2 SHA256 1a6776e9bac6bc88dd82c498ccd1b48cbe900046c939dc48ed36551211c8e6cb
+DIST GPLIGC-1.7-src-src.tar.gz 990063 RMD160 fb9e3f436731675249fbf5ed4cc6d4dc983fb94e SHA1 7a7b22e4d0d4c79f6b4baffc72f31a674c012956 SHA256 6b2f81ab4b12e02edb574a0adb7a3868fce203794994e448265bef11d00bf69f
+EBUILD gpligc-1.7.ebuild 2406 RMD160 6509a2037a231e702d0795a956af1d28e77b528e SHA1 387a419348db6a29e8da01e369ad11a0c8f80bb0 SHA256 c49bc22e8d70be3c7de18e5f47a591bab28808e67dc7917c02f3903ca67d9431
+MISC ChangeLog 1085 RMD160 9474cd2cc36428aeede0bf13823c475ade8ff034 SHA1 bef9d6a65b2ddde6630c729e0599b871fcf484fa SHA256 bb0accff8b175fea4cfb7ec24132633074c8f531fc687a564bf1f445ef3276dc
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-misc/gpligc/gpligc-1.7.ebuild b/app-misc/gpligc/gpligc-1.7.ebuild
index 512851aee..c84cb4132 100644
--- a/app-misc/gpligc/gpligc-1.7.ebuild
+++ b/app-misc/gpligc/gpligc-1.7.ebuild
@@ -5,7 +5,7 @@
 inherit eutils
 
 MY_PN="GPLIGC"
-MY_P=${MY_PN}-${PV}
+MY_P="${MY_PN}-${PV}-src"
 DESCRIPTION="provides IGC-file (GPS tracklog) evaluation and 3D visualisation"
 HOMEPAGE="http://gpligc.sf.net/"
 SRC_URI="http://pc12-c714.uibk.ac.at/GPLIGC/download/${MY_P}-src.tar.gz"
@@ -29,8 +29,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	cd openGLIGCexplorer
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "Build failed"
+	emake -C openGLIGCexplorer CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "Build failed"
 }
 
 src_install() {
@@ -40,38 +39,35 @@ src_install() {
 	keepdir /usr/share/${PN}/data/dem
 	keepdir /usr/share/${PN}/data/waypoint
 
+	# paths to perl modules have to be set in scripts/modules
+	sed -i -e "s:PREFIX:/usr:g" openGLIGCexplorer/.openGLIGCexplorerrc || die "sed failed"
+	sed -i -e "s:zzLIBDIRzz:/usr/share/${PN}/:g" GPLIGC/GPLIGC.pl || die "sed failed"
+	sed -i -e "s:zzLIBDIRzz:/usr/share/${PN}/:g" GPLIGC/GPLIGCwaypoints.pm || die "sed failed"
+
 	# install binaries and scripts
-	dobin GPLIGC/{GPLIGC.pl,gpsp2igc.pl,gpsp2igcfile.pl,gpsp2kml.pl} \
-		openGLIGCexplorer/{openGLIGCexplorer,createworld,etopo2merger,optimizer}
+	dobin GPLIGC/{GPLIGC,gpsp2igc,gpsp2igcfile,gpsp2kml}.pl \
+		openGLIGCexplorer/{openGLIGCexplorer,createworld,etopo2merger,optimizer} \
+			|| die "dobin failed"
 
 	# install perl modules and icons/pics and sample configuration
 	insinto /usr/share/${PN}
-	doins GPLIGC/{GPLIGCfunctions.pm,GPLIGCwaypoints.pm,gpligc.xbm,icon.png,logo.jpg,logos.gif,logos.jpg} \
-		openGLIGCexplorer/.openGLIGCexplorerrc
-
-	dodoc doc/CHANGES
+	doins GPLIGC/{{GPLIGCfunctions,GPLIGCwaypoints}.pm,gpligc.xbm,icon.png,logo.jpg,logos.gif,logos.jpg} \
+		openGLIGCexplorer/.openGLIGCexplorerrc || die "doins failed"
 
-	# at least this pdf is supposed to be used often, so its better left uncompressed
-	insinto /usr/share/doc/${P}
-	doins doc/GPLIGC_Manual.pdf
-
-	# paths to perl modules have to be set in scripts/modules
-	dosed "s:PREFIX:/usr:g" /usr/share/${PN}/.openGLIGCexplorerrc
-	dosed "s:zzLIBDIRzz:/usr/share/${PN}/:g" /usr/bin/GPLIGC.pl
-	dosed "s:zzLIBDIRzz:/usr/share/${PN}/:g" /usr/share/${PN}/GPLIGCwaypoints.pm
+	dodoc doc/{CHANGES,GPLIGC_Manual.pdf} || die "dodoc failed"
 
 	# some symlinks
-	dosym /usr/bin/GPLIGC.pl /usr/bin/GPLIGC
-	dosym /usr/bin/openGLIGCexplorer /usr/bin/ogie
+	dosym /usr/bin/GPLIGC.pl /usr/bin/GPLIGC || die "dosym failed"
+	dosym /usr/bin/openGLIGCexplorer /usr/bin/ogie || die "dosym failed"
 }
 
 pkg_postinst() {
-	echo
-	elog "Information about using and configuring GPLIGC and"
-	elog "openGLIGCexplorer (ogie) can be found in the provided manual:"
-	elog "/usr/share/doc/${P}/GPLIGC_Manual.pdf"
-	elog "Users should copy ogie's example configuration file from"
-	elog "/usr/share/${PN}/.openGLIGCexplorerrc to the own HOME directory"
-	elog "and edit it according to their needs."
-	echo
+	einfo
+	einfo "Information about using and configuring GPLIGC and"
+	einfo "openGLIGCexplorer (ogie) can be found in the provided manual:"
+	einfo "/usr/share/doc/${P}/GPLIGC_Manual.pdf"
+	einfo "Users should copy ogie's example configuration file from"
+	einfo "/usr/share/${PN}/.openGLIGCexplorerrc to the own HOME directory"
+	einfo "and edit it according to their needs."
+	einfo
 }