summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-08 11:40:12 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-08 11:40:12 +0000
commit328fd9bbbbbcd10dd1722f004253760d19902750 (patch)
tree59d77e8b0b61c355d166f9233adba4647423dd78 /media-tv
parentInitial version, ebuild contributed by Lucian Muresan (diff)
downloadgentoo-2-328fd9bbbbbcd10dd1722f004253760d19902750.tar.gz
gentoo-2-328fd9bbbbbcd10dd1722f004253760d19902750.tar.bz2
gentoo-2-328fd9bbbbbcd10dd1722f004253760d19902750.zip
Set app-defaults directory for modular xorg. Thanks to Andi for reporting in bug #150445.
(Portage version: 2.1.2_pre2-r6)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/xdtv/ChangeLog6
-rw-r--r--media-tv/xdtv/xdtv-2.2.0-r1.ebuild14
2 files changed, 15 insertions, 5 deletions
diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index 1f74b4e18c62..95bf53811fb1 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-tv/xdtv
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.40 2006/10/01 17:43:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.41 2006/10/08 11:40:12 flameeyes Exp $
+
+ 08 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> xdtv-2.2.0-r1.ebuild:
+ Set app-defaults directory for modular xorg. Thanks to Andi for reporting in
+ bug #150445.
01 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> xdtv-2.2.0-r1.ebuild,
xdtv-2.3.3.ebuild:
diff --git a/media-tv/xdtv/xdtv-2.2.0-r1.ebuild b/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
index 027417b1b0ae..88737d765d1a 100644
--- a/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
+++ b/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.2.0-r1.ebuild,v 1.11 2006/10/01 17:43:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.2.0-r1.ebuild,v 1.12 2006/10/08 11:40:12 flameeyes Exp $
inherit font multilib autotools
@@ -132,12 +132,18 @@ extension_install() {
src_unpack() {
unpack ${A}
# Disable font installation
- sed -i -e '/^install:/,/^$/s:^\t:#:p' ${S}/font/Makefile.in
+ sed -i -e '/^install:/,/^$/s:^\t:#:p' "${S}"/font/Makefile.in
# Disable /usr/share/xdtv/icons/* installation
- sed -i -e '/^install-data-local:/,${\:share/xdtv/icons:d}' ${S}/Makefile.in
+ sed -i -e '/^install-data-local:/,${\:share/xdtv/icons:d}' "${S}"/Makefile.in
cd ${S}
- epatch ${WORKDIR}/${P}-gcc4-amd64.patch
+ epatch "${WORKDIR}/${P}-gcc4-amd64.patch"
+
+ has_version '<x11-base/xorg-x11-7.0' && \
+ appdefaultsdir="/etc/X11/app-defaults" || \
+ appdefaultsdir="/usr/share/X11/app-defaults"
+
+ sed -i -e 's:^app_defaults=""$:app_defaults="'${appdefaultsdir}'":' "${S}/configure.in"
eautoreconf
}