summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2010-12-26 22:55:44 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2010-12-26 22:55:44 +0000
commitbe9fdd752ab199be0bae04b803f2f6249ba7aa6a (patch)
tree0d2d3b01028bba83f28fe2e063179b0528bbf0be /media-plugins/vdr-graphlcd
parentBug #349083: Fix a false positive in the Git testsuite, triggered when the po... (diff)
downloadgentoo-2-be9fdd752ab199be0bae04b803f2f6249ba7aa6a.tar.gz
gentoo-2-be9fdd752ab199be0bae04b803f2f6249ba7aa6a.tar.bz2
gentoo-2-be9fdd752ab199be0bae04b803f2f6249ba7aa6a.zip
fix #349793; some minor ebuild fixes
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-graphlcd')
-rw-r--r--media-plugins/vdr-graphlcd/ChangeLog7
-rw-r--r--media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild13
-rw-r--r--media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5.ebuild13
-rw-r--r--media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.8.ebuild10
4 files changed, 27 insertions, 16 deletions
diff --git a/media-plugins/vdr-graphlcd/ChangeLog b/media-plugins/vdr-graphlcd/ChangeLog
index 874a3a417f09..e5ef1ca69139 100644
--- a/media-plugins/vdr-graphlcd/ChangeLog
+++ b/media-plugins/vdr-graphlcd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/vdr-graphlcd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.20 2010/12/03 14:37:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.21 2010/12/26 22:55:44 hd_brummy Exp $
+
+ 26 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+ vdr-graphlcd-0.1.5.ebuild, vdr-graphlcd-0.1.5-r1.ebuild,
+ vdr-graphlcd-0.1.8.ebuild:
+ fix #349793; some minor ebuild fixes
*vdr-graphlcd-0.1.8 (03 Dec 2010)
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild
index 093c10af62f2..0244e0a36018 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild,v 1.1 2008/01/01 12:04:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild,v 1.2 2010/12/26 22:55:44 hd_brummy Exp $
inherit eutils vdr-plugin
@@ -17,11 +17,10 @@ IUSE="truetype"
DEPEND=">=media-video/vdr-1.2.6
>=app-misc/graphlcd-base-${PV}"
-PATCHES="
- ${FILESDIR}/${PV}/graphlcd-${PV}-span.diff
- ${FILESDIR}/${PV}/graphlcd-${PV}-radiotext-lcr-service.diff
- ${FILESDIR}/${PV}/${P}-missing-include.patch
- ${FILESDIR}/${PV}/graphlcd-${PV}_vdr-1.5.3.diff"
+PATCHES=("${FILESDIR}/${PV}/graphlcd-${PV}-span.diff"
+ "${FILESDIR}/${PV}/graphlcd-${PV}-radiotext-lcr-service.diff"
+ "${FILESDIR}/${PV}/${P}-missing-include.patch"
+ "${FILESDIR}/${PV}/graphlcd-${PV}_vdr-1.5.3.diff")
pkg_setup() {
vdr-plugin_pkg_setup
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5.ebuild
index ffd5e4f83e39..10c1071aed71 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5.ebuild,v 1.4 2007/06/26 19:54:28 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5.ebuild,v 1.5 2010/12/26 22:55:44 hd_brummy Exp $
inherit eutils vdr-plugin
@@ -17,11 +17,10 @@ IUSE="truetype"
DEPEND=">=media-video/vdr-1.2.6
>=app-misc/graphlcd-base-${PV}"
-PATCHES="
- ${FILESDIR}/${PV}/graphlcd-${PV}-span.diff
- ${FILESDIR}/${PV}/graphlcd-${PV}-radiotext-lcr-service.diff
- ${FILESDIR}/${PV}/${P}-missing-include.patch
- ${FILESDIR}/${PV}/graphlcd-${PV}_vdr-1.5.3.diff"
+PATCHES=("${FILESDIR}/${PV}/graphlcd-${PV}-span.diff"
+ "${FILESDIR}/${PV}/graphlcd-${PV}-radiotext-lcr-service.diff"
+ "${FILESDIR}/${PV}/${P}-missing-include.patch"
+ "${FILESDIR}/${PV}/graphlcd-${PV}_vdr-1.5.3.diff")
pkg_setup() {
vdr-plugin_pkg_setup
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.8.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.8.ebuild
index 5767d2ef6014..8fdcb045f2bc 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.8.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.8.ebuild,v 1.1 2010/12/03 14:37:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.8.ebuild,v 1.2 2010/12/26 22:55:44 hd_brummy Exp $
EAPI="2"
@@ -18,6 +18,7 @@ IUSE=""
DEPEND=">=media-video/vdr-1.6
>=app-misc/graphlcd-base-0.1.7"
+RDEPEND="${DEPEND}"
pkg_setup() {
vdr-plugin_pkg_setup
@@ -42,9 +43,16 @@ src_prepare() {
vdr-plugin_src_prepare
sed -i "s:/usr/local:/usr:" Makefile
+
+ sed -i "s:i18n.c:i18n.h:g" Makefile
+
+ if ! has_version ">=media-video/vdr-1.7.13"; then
+ sed -i "s:include \$(VDRDIR)/Make.global:#include \$(VDRDIR)/Make.global:" Makefile
+ fi
}
src_install() {
+
vdr-plugin_src_install
insopts -m0644 -ovdr -gvdr