several upates: tidying up ebuilds, changes to bst assertion args

3 files changed, 38 insertions, 47 deletions

diff --git a/media-tv/pvr/Manifest b/media-tv/pvr/Manifest
index 04822e8..4e31924 100644
--- a/media-tv/pvr/Manifest
+++ b/media-tv/pvr/Manifest
@@ -1,4 +1,4 @@
-DIST pvr-0.1.9.tar.bz2 6765 RMD160 3d0894909f537e04fb24c644b1ae66df48664bc2 SHA1 705e65f0715bfe9ac3cf3e1ad2613cc4eaaa15e8 SHA256 a25c3775999921dad9cf356260649609cbfd6dafae4ad6f96f9c409a58717c78
-EBUILD pvr-0.1.9.ebuild 1105 RMD160 bcd7234a35b37a8388c012a884f289b8aa43ae95 SHA1 5ac048f2f3817b3bae7b6e3fe580f5767ade7257 SHA256 9441761111ec02fc713ff14929a1d9ef34c80323d5f7a6fd741357ecc8fc1a50
+DIST pvr-0.2.0.tar.bz2 6933 RMD160 c172bbf0bc42a2e1d8088f628a12bfe80244d3ef SHA1 3e9c834faad4b1a46ff0d7baad7eb3e570a896e8 SHA256 546e88b12fe448526e33ea6cad0a2934f6939a49e04a96f122072675226cf43c
+EBUILD pvr-0.2.0.ebuild 703 RMD160 b8bd5c1910b3167cfbc8db0ef5fc42069b4408c0 SHA1 4cf1341d6646cfc1d4946ee6462551e750da6ccb SHA256 59b1d68ab351fde29e1f3e2b76225f33be9ce8bca080f3a102579019aee51b7a
 MISC ChangeLog 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 MISC metadata.xml 402 RMD160 8caa270917a62f075532aa7d1f6914307858856c SHA1 79915791cf4c58be4c2184af4f2a3f03939b81d3 SHA256 de6f248192c983802ec3447fab4c1e59227cab5228ac12979a8e433a6a82cf4c
diff --git a/media-tv/pvr/pvr-0.1.9.ebuild b/media-tv/pvr/pvr-0.1.9.ebuild
deleted file mode 100644
index 86caef4..0000000
--- a/media-tv/pvr/pvr-0.1.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-EAPI=2
-inherit eutils
-DESCRIPTION="gentoo system management"
-HOMEPAGE=""
-SRC_URI="http://www.aperiplus.co.uk/downloads/src/${P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-#DEPEND=""
-
-RDEPEND="app-misc/bashfun
-	media-video/mplayer
-	media-video/projectx"
-
-src_install() {
-    dodir '/opt/pvr' || die "out of cheese error 1"
-    insinto '/opt/pvr'  || die "out of cheese error 2"
-    cp -ar ${S}'/opt/pvr/'* ${D}'/opt/pvr/' || die "out of cheese error 3"
-    
-    dodir '/etc/pvr'  || die "out of cheese error 4"
-    insinto '/etc/pvr'  || die "out of cheese error 5"
-    doins ${S}'/etc/pvr/config.sh'  || die "out of cheese error 6"
-}
-
-pkg_postinst() {
-    if [ ! -f /opt/bin/pvr ]
-    then
-        cd /opt/bin
-	ln -s /opt/pvr/bin/pvr.sh pvr
-    fi
-    
-    path_minus_opt_bin=`echo $PATH | sed 's~/opt/bin:~~g'`
-    if [ $PATH = $path_minus_opt_bin ] 
-    then
-	ewarn 
-	ewarn '/opt/bin is not in your $PATH!'
-	ewarn '(pvr is installed at /opt/bin/pvr)'
-	ewarn
-    fi
-    ewarn
-    ewarn 'you may want to edit /etc/pvr/config.sh now - just follow instructions in the file'
-    ewarn
-}
diff --git a/media-tv/pvr/pvr-0.2.0.ebuild b/media-tv/pvr/pvr-0.2.0.ebuild
new file mode 100644
index 0000000..30605fd
--- /dev/null
+++ b/media-tv/pvr/pvr-0.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="gentoo system management"
+HOMEPAGE=""
+SRC_URI="http://www.aperiplus.co.uk/downloads/src/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/bashfun
+	media-video/mplayer
+	media-video/projectx"
+
+#DEPEND=""
+
+src_install() {
+    dosym /opt/pvr/bin/pvr.sh /opt/bin/pvr
+    insinto '/opt/pvr'
+    doins -r "${S}/opt/pvr"
+    insinto '/etc/pvr'
+    doins "${S}/etc/pvr/config.sh"
+}
+
+pkg_postinst() {
+    elog
+    elog 'you may want to edit /etc/pvr/config.sh now - just follow instructions in the file'
+    elog
+}