Use src_prepare instead of src_unpack, improved find call, added missing die statemen...

(Portage version: 2.2_rc33/svn/Linux x86_64)

svn path=/sunrise/; revision=8493

diff --git a/games-fps/uhexen2-cvs/ChangeLog b/games-fps/uhexen2-cvs/ChangeLog
index c552eede9e17814b33df58dfa82625df46bdc5e7..beb5873d4166fbcbec6d9b20497878192d449a5e 100644 (file)
--- a/games-fps/uhexen2-cvs/ChangeLog
+++ b/games-fps/uhexen2-cvs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 May 2009; Christian Ruppert <idl0r@gentoo.org>
+  uhexen2-cvs-20080404.ebuild:
+  Use src_prepare instead of src_unpack, improved find call, added missing
+  die statements, replaced some elog calls by einfo.
+
   16 Mar 2009; Nick Fortino (nfortino) <nfortino@gmail.com>
   uhexen2-cvs-20080404.ebuild:
   Update ebuild to use EAPI 2. Thanks to Cristian Ruppert and Thomas Sachau

diff --git a/games-fps/uhexen2-cvs/Manifest b/games-fps/uhexen2-cvs/Manifest
index 8fff0eabce1afc3dc238b3e9e776f264b9f26921..a52b65017f13fdcaafc58b1c9c7d3001f49ad6ee 100644 (file)
--- a/games-fps/uhexen2-cvs/Manifest
+++ b/games-fps/uhexen2-cvs/Manifest
@@ -1,6 +1,6 @@
 DIST gamedata-all-1.19a.tgz 3703488 RMD160 3dad3b4b3aa80fb595749a6768376a245db89c12 SHA1 25ce550057c511b5cc2e4372163c0216eac35fcd SHA256 b9b9561b4155bfe3f8005315a7f8f95a567c2ebbcb2a950ad05dcb1702ac68de
 DIST hexenworld-pakfiles-0.15.tgz 4948641 RMD160 bbc3d2368b01d60accf457b42f9ed5d247f94d1b SHA1 a7600b80b4205788b64fb57191e194c28b55b522 SHA256 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9
 DIST uhexen2-cvs-20080404.tgz 6434136 RMD160 9d931a13fc7e4c69d4b4183aacda18a76fcd62e6 SHA1 10716270bc65fed4b7484c60b64e71571b47d337 SHA256 5043b8642823a7493b0ff0f6105e79e475b597f9214769efd005366b0e09a172
-EBUILD uhexen2-cvs-20080404.ebuild 12703 RMD160 6661478561a2c7a12fa4ef30e312add2c9965f48 SHA1 57a206a71e3fdbd7311eb3070477514d30b65273 SHA256 6a765f00aac12c8b33f033be50f4f21b4ea757df4d9a6ee5829777eb121ad711
-MISC ChangeLog 9546 RMD160 051598c9255eeacc05a45094911da457f6af4c0d SHA1 d7fb0fbee821a27cbbf0ae2a5ee9f6dc989dc7fe SHA256 426b22da48b18a6a88ed32712bb1ffdf5dc950d5c528e95a12d9afaf5bbe86ba
+EBUILD uhexen2-cvs-20080404.ebuild 12703 RMD160 c7b2f5c503d6688f30b1354cc3e3734b1b8e2f4a SHA1 34ce25ec778a7442b53576b429df84a5cf9ff29f SHA256 8056ad8c5909a93d295ed2b9b2d9192593034956433eecb2f8f35c3983656763
+MISC ChangeLog 9758 RMD160 0d9d43cd1ce7656f491ad3c13207ed416e1c782b SHA1 0ad90dbb5a6a1aef7dd01ecbf61665e716847c5f SHA256 4f73a408ae65317693137d6a6cd0d4a40dd5fa0278efbe75305b705b94bffb24
 MISC metadata.xml 1130 RMD160 a17879b273ebaa4a40d2e28983bc3d879115f63f SHA1 9dd1f9419117a5ef3926d76cabf2acac531ebff4 SHA256 8ac87921b75770f551178a0a713eb32ae84c78248c10f8d43f360d09e31a8078

diff --git a/games-fps/uhexen2-cvs/uhexen2-cvs-20080404.ebuild b/games-fps/uhexen2-cvs/uhexen2-cvs-20080404.ebuild
index 2f448f97d25605e2fb8d2d92d72eb2eaa29c8cfd..ca68ed793e3daacadc7639ff3d3248b294cb74a7 100644 (file)
--- a/games-fps/uhexen2-cvs/uhexen2-cvs-20080404.ebuild
+++ b/games-fps/uhexen2-cvs/uhexen2-cvs-20080404.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils flag-o-matic toolchain-funcs versionator games
+inherit eutils flag-o-matic toolchain-funcs games
 
 DATA_PV="1.19a"
 HW_PV="0.15"
@@ -68,12 +68,9 @@ pkg_setup() {
        use alsa || ewarn "alsa is the recommended sound driver."
 }
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        # Clean CVS stuff
-       for x in `find . -name CVS -print`; do rm -fr ${x}; done
+       find . -type d -name 'CVS' -exec rm -fr {} ';'
 
        cd hexen2
        epatch "${S}/00_Patches/external-music-file-support.diff"
@@ -364,7 +361,7 @@ src_install() {
        head -22 "00_Patches/external-music-file-support.diff" > \
        "docs/external_music.README" || die "make readme failed"
 
-       dodoc docs/*
+       dodoc docs/* || die
 
        if ! use demo ; then
                # Install updated game data
@@ -373,7 +370,7 @@ src_install() {
                # Patching should really be done by a future "hexen2-data" ebuild.
                # But this works for now.
                doins "${WORKDIR}"/update_xdelta.sh || die
-               dodoc "${WORKDIR}"/*.txt
+               dodoc "${WORKDIR}"/*.txt || die
        fi
 
        if use tools ; then
@@ -403,10 +400,10 @@ pkg_postinst() {
        games_pkg_postinst
 
        if use demo ; then
-               elog "uhexen2 has been compiled specifically to play the demo maps."
-               elog "Example command-line:"
-               elog "   hexen2-demo -width 1024 -height 768 -conwidth 640"
-               echo
+               einfo "uhexen2 has been compiled specifically to play the demo maps."
+               einfo "Example command-line:"
+               einfo "   hexen2-demo -width 1024 -height 768 -conwidth 640"
+               einfo
        else
                elog "To play the demo, emerge with the 'demo' USE flag."
                elog
@@ -425,39 +422,39 @@ pkg_postinst() {
                elog
                elog "Example command-line:"
                elog "   hexen2 -width 1024 -height 768 -conwidth 640"
-               echo
+               einfo
        fi
        if use gtk ; then
-               elog "You've also installed a nice graphical launcher. Simply run:"
-               elog
-               elog "   h2launcher"
-               elog
-               elog "to enjoy it :)"
-               echo
+               einfo "You've also installed a nice graphical launcher. Simply run:"
+               einfo
+               einfo "   h2launcher"
+               einfo
+               einfo "to enjoy it :)"
+               einfo
        fi
        if use tools ; then
                if use hexenworld; then
-                       elog "You've also installed some Hexenworld utility:"
-                       elog
-                       elog " - hwmquery (console app to query HW master servers)"
-                       elog " - hwrcon (remote interface to HW rcon command)"
-                       elog " - hwterm (HW remote console terminal)"
-                       echo
+                       einfo "You've also installed some Hexenworld utility:"
+                       einfo
+                       einfo " - hwmquery (console app to query HW master servers)"
+                       einfo " - hwrcon (remote interface to HW rcon command)"
+                       einfo " - hwterm (HW remote console terminal)"
+                       einfo
                fi
-               elog "You've also installed some Hexen2 utility"
-               elog "(useful for mod developing)"
-               elog
-               elog " - dhcc (old progs.dat compiler/decompiler)"
-               elog " - genmodel (3-D model grabber)"
-               elog " - hcc (HexenC compiler)"
-               elog " - hcc_old (old version of HexenC compiler)"
-               elog " - jsh2color (light colouring utility)"
-               elog " - maputils (Map compiling tools: bspinfo, light, qbsp, vis)"
-               elog " - qfiles (build pak files and regenerate bsp models)"
-               elog " - bsp2wal (extract all textures from a bsp file)"
-               elog " - lmp2pcx (convert hexen2 texture data into pcx and tga)"
-               elog
-               elog "See relevant documentation for further informations"
-               echo
+               einfo "You've also installed some Hexen2 utility"
+               einfo "(useful for mod developing)"
+               einfo
+               einfo " - dhcc (old progs.dat compiler/decompiler)"
+               einfo " - genmodel (3-D model grabber)"
+               einfo " - hcc (HexenC compiler)"
+               einfo " - hcc_old (old version of HexenC compiler)"
+               einfo " - jsh2color (light colouring utility)"
+               einfo " - maputils (Map compiling tools: bspinfo, light, qbsp, vis)"
+               einfo " - qfiles (build pak files and regenerate bsp models)"
+               einfo " - bsp2wal (extract all textures from a bsp file)"
+               einfo " - lmp2pcx (convert hexen2 texture data into pcx and tga)"
+               einfo
+               einfo "See relevant documentation for further informations"
+               einfo
        fi
 }