Removed unused eutils inherit, use src_prepare instead of src_unpack, added missing...

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

svn path=/sunrise/; revision=8496

diff --git a/www-apps/tt-rss/ChangeLog b/www-apps/tt-rss/ChangeLog
index 71952bb0b0ddfea7ba5e88b0a4a86ac7637b8448..002a41c9f90d4775efc4730b4940150ad558081a 100644 (file)
--- a/www-apps/tt-rss/ChangeLog
+++ b/www-apps/tt-rss/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 May 2009; Christian Ruppert <idl0r@gentoo.org> tt-rss-1.3.2.ebuild:
+  Removed unused eutils inherit, use src_prepare instead of src_unpack,
+  added missing die statements.
+
   01 Apr 2009; Patrick Nagel (padde) <mail@patrick-nagel.net>
   -tt-rss-1.3.0.ebuild, +tt-rss-1.3.2.ebuild:
   Version bump for tt-rss

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 49dab8673a7c50c8d14946e4a878d7e9987a03c8..643530c5b5e2d17ef9fdafe5d50b1b5a1169077e 100644 (file)
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 58 RMD160 b457795efe41cee2f36bbe6fa37a3eb983a9af62 SHA1 2c62f7e3e26d20fe29e12360638c767c6472caf7 SHA256 7c524c14d391c76d72b22c947b68d20321bd98de3f892b1e044c3de6c281de59
 DIST tt-rss-1.3.2.tar.gz 742889 RMD160 13ea29ca0772abc64fd51a44a9a2844eef72b466 SHA1 beb2ef5abc061827908d764b0a1e9f54bf4f72ca SHA256 7acf6c604b78ac1d6760ce033cc98df60c916994561562ccf22ab2c7a56edea6
-EBUILD tt-rss-1.3.2.ebuild 1297 RMD160 555964b8b6a82e4899f35e6e768686f07a2eeec7 SHA1 00bbfaea2d3e82fe2e68a9a5090144445a16d61f SHA256 f7bc10de3e4b2cb479ef2291a5777dd92919ed8a71958435ba4a2079eecfad95
-MISC ChangeLog 841 RMD160 8b3c2a7895e43d05d75de49ba4d846a4e4b7572a SHA1 34b5010356bff1cbb09d5627f4908f366fd62035 SHA256 5c47dd35ec1e39badf6172df132ef3bcdb82a8b29701493c355c2b0a8b656adf
+EBUILD tt-rss-1.3.2.ebuild 1310 RMD160 e54227aaa83eb685138518aac3cb2cac3b84c2dd SHA1 b028c63c5f3970d6c567a18b4639bd56f55f8d66 SHA256 e149348a89c64b7699e5a57f5e3df1c0615a1dce89058416fa7d793ab26a98e5
+MISC ChangeLog 1019 RMD160 66803279c44be85306838df0690ec0f5e896e235 SHA1 b02337aeac4df39dfc1e9d7d4ef0fbae8a173e83 SHA256 0327238ccea632b0a3a8ba721725e97ba0bd2269f438f50c21b9983b15e30e2c
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf

diff --git a/www-apps/tt-rss/tt-rss-1.3.2.ebuild b/www-apps/tt-rss/tt-rss-1.3.2.ebuild
index f04e091a1763ee637cf47d508d870c2923729a97..0ccf87bb9dd99e51f7f93ed917735a0eb368b587 100644 (file)
--- a/www-apps/tt-rss/tt-rss-1.3.2.ebuild
+++ b/www-apps/tt-rss/tt-rss-1.3.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils webapp depend.php depend.apache
+inherit webapp depend.php depend.apache
 
 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
 HOMEPAGE="http://tt-rss.org/"
@@ -20,17 +20,15 @@ RDEPEND="${DEPEND}"
 need_httpd_cgi
 need_php_httpd
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        # Customize config.php so that the right 'DB_TYPE' is already set (according to the USE flag)
        einfo "Customizing config.php..."
        mv config.php{-dist,} || die "Could not rename config.php-dist to config.php."
        if ( use mysql || use mysqli ) && ! use postgres; then
-               sed -e "/define('DB_TYPE',/{s:pgsql:mysql:}" -i config.php
+               sed -e "/define('DB_TYPE',/{s:pgsql:mysql:}" -i config.php || die "sed failed"
        fi
-       sed -e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" -i config.php
+       sed -e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" -i config.php \
+               || die "sed failed"
 }
 
 src_install () {