Update live ebuilds to be in line with latest on gentoo.org

(Portage version: 2.1.9.24/svn/Linux x86_64)

svn path=/testing/; revision=757

4 files changed, 36 insertions, 13 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index d036930..f797277 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.7 2006/10/13 10:43:30 zzam Exp $
 
+  14 Nov 2010; Matthias Schwarzott <zzam@gentoo.org>
+  gentoo-vdr-scripts-9998.ebuild, gentoo-vdr-scripts-9999.ebuild,
+  metadata.xml:
+  Update live ebuilds to be in line with latest on gentoo.org
+
   05 Aug 2008; Matthias Schwarzott <zzam@gentoo.org>
   -gentoo-vdr-scripts-0.4.5_pre1.ebuild,
   -gentoo-vdr-scripts-0.4.5_pre2.ebuild,
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9998.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9998.ebuild
index 4484ba4..b8a507b 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9998.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9998.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild,v 1.8 2006/10/13 10:43:30 zzam Exp $
 
+EAPI="2"
+
 : ${ESVN_REPO_URI:=http://anonsvn.gentoo.org/repositories/gentoo-vdr/${PN}/trunk}
 inherit eutils
 
@@ -11,12 +13,13 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nvram"
 
 DEPEND="net-misc/wget"
 RDEPEND="nvram? ( sys-power/nvram-wakeup )
 	app-admin/sudo
+	sys-process/wait_on_pid
 	!media-tv/vdr-dvd-scripts
 	!media-tv/vdrplugin-rebuild"
 
@@ -41,6 +44,12 @@ src_unpack() {
 	set +x
 }
 
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
 src_install() {
 	emake -s install DESTDIR="${D}" || die "make install failed"
 	dodoc README TODO ChangeLog
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild
index d9f47ed..9f72221 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild,v 1.8 2006/10/13 10:43:30 zzam Exp $
 
+EAPI="2"
+
 : ${ESVN_REPO_URI:=svn://anonsvn.gentoo.org/gentoo-vdr/${PN}/trunk}
 inherit eutils subversion
 
@@ -11,11 +13,12 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nvram"
 
 RDEPEND="nvram? ( sys-power/nvram-wakeup )
 	app-admin/sudo
+	sys-process/wait_on_pid
 	!media-tv/vdr-dvd-scripts
 	!media-tv/vdrplugin-rebuild"
 
@@ -31,6 +34,12 @@ pkg_setup() {
 	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
 }
 
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
 src_install() {
 	emake -s install DESTDIR="${D}" || die "make install failed"
 	dodoc README TODO ChangeLog
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index d1b88e6..ecc47f1 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+	<herd>media-tv</herd>
+	<maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+  <use>
+    <flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
+  </use>
 </pkgmetadata>
-