Set app-defaults directory for modular xorg. Thanks to Andi for reporting in bug #150445.

Package-Manager: portage-2.1.2_pre2-r6

3 files changed, 26 insertions, 16 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/Manifest b/media-tv/xdtv/Manifest
index e23cc28a1afe..0c64ae1a62b3 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -67,18 +67,18 @@ DIST libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769 RMD160 f9de71a685296cf00339d91
 DIST xdtv-2.2.0-gcc4-amd64.patch.tar.gz 6027 RMD160 eeab9185747eae8f7887d65e5035e7070134bbd3 SHA1 396a3657a6d2110302063b63e817d0faae114b76 SHA256 d2307c8cb4dc4459d396da7ffb9309f6a3660d449421796ae1e8152c5cc67afe
 DIST xdtv-2.2.0.tar.gz 905162 RMD160 ff002f07cbba6d076e73142eb5b1cd1ba97448c3 SHA1 8a7f4e92e1d1604541aed9689cc701bdef9822f1 SHA256 a7828bc963133184f27df78e9c2d23c2b5f75e130801a114b85fbf137d2780c4
 DIST xdtv-2.3.3.tar.gz 2874010 RMD160 839627fdf614f2bf18a8c6afde31a418db5a975f SHA1 b3368226538d4cdc1673d574351f21dab8c237b1 SHA256 4819afdb4a706adb570b140574e24432a9da168c821133abd246f821ce09f0a2
-EBUILD xdtv-2.2.0-r1.ebuild 6837 RMD160 48aefedebea6022ce36c45664e698138a1be209b SHA1 1a2515fb66a91cacc3678a391da52560302abf1d SHA256 ec35d60b46a6791c76ee5a8a7c529221ef33f5c4eb60abfe096a829a63f3de6d
-MD5 88ea0d747570ab64f9b65d4323414420 xdtv-2.2.0-r1.ebuild 6837
-RMD160 48aefedebea6022ce36c45664e698138a1be209b xdtv-2.2.0-r1.ebuild 6837
-SHA256 ec35d60b46a6791c76ee5a8a7c529221ef33f5c4eb60abfe096a829a63f3de6d xdtv-2.2.0-r1.ebuild 6837
+EBUILD xdtv-2.2.0-r1.ebuild 7070 RMD160 b50bf05521472d5cb3f289bd645d2958a78c591c SHA1 88a4e77c8d5bcdf4a4cf7bc1aefd337916c27dec SHA256 61046ad9d8eac0644b75a2d71465f215243a7fbae7f28c133bcd91b8cdf48a96
+MD5 b811e208977eea28eab8c2c50d268b4e xdtv-2.2.0-r1.ebuild 7070
+RMD160 b50bf05521472d5cb3f289bd645d2958a78c591c xdtv-2.2.0-r1.ebuild 7070
+SHA256 61046ad9d8eac0644b75a2d71465f215243a7fbae7f28c133bcd91b8cdf48a96 xdtv-2.2.0-r1.ebuild 7070
 EBUILD xdtv-2.3.3.ebuild 5817 RMD160 8f2d0c0c13b86e4fd7551039fffafad50d750852 SHA1 09fa74714eef0aae3b0a464100e6083c96ced31d SHA256 b8f29ad1326c965a745f883f74e0c3fc4890502e298ad6cc0444ea8b87641d09
 MD5 e5e9dc88d1e5539064d30328725e3cf9 xdtv-2.3.3.ebuild 5817
 RMD160 8f2d0c0c13b86e4fd7551039fffafad50d750852 xdtv-2.3.3.ebuild 5817
 SHA256 b8f29ad1326c965a745f883f74e0c3fc4890502e298ad6cc0444ea8b87641d09 xdtv-2.3.3.ebuild 5817
-MISC ChangeLog 6713 RMD160 42f5423c819731b5c8ef910d4304838be17e6fc1 SHA1 5ac40f9cf965cfe377bf357571a9edc31f5e2729 SHA256 66ad9880a138db19c9d6542c5a1983e0740f722f620f508c01770a5464b64870
-MD5 2afca13464d030e6310163e4d057b2c4 ChangeLog 6713
-RMD160 42f5423c819731b5c8ef910d4304838be17e6fc1 ChangeLog 6713
-SHA256 66ad9880a138db19c9d6542c5a1983e0740f722f620f508c01770a5464b64870 ChangeLog 6713
+MISC ChangeLog 6883 RMD160 c71d0727d27532f99cb9326f72a2c94db173ec92 SHA1 d74496fc1c3276e5f0e743774a503bcc28a280d9 SHA256 8a6898f98b5db08a699e9b19132eddff0dffc9d336853866b0289325848b7ac9
+MD5 daee2c49b5dd3d6881f7b0ff181283bc ChangeLog 6883
+RMD160 c71d0727d27532f99cb9326f72a2c94db173ec92 ChangeLog 6883
+SHA256 8a6898f98b5db08a699e9b19132eddff0dffc9d336853866b0289325848b7ac9 ChangeLog 6883
 MISC metadata.xml 252 RMD160 9fe0fe39a9fa8f2fce26f12d0d5caada0a1593cd SHA1 40066ea1ed9d73b98efac9f1af00a78527062db6 SHA256 4c5fd4c15db1f66e645f0591edae40f860fd78c83b2edc0ae264eef1d03092f5
 MD5 0dfc4d0a0cad3dc6b761593f69ac917b metadata.xml 252
 RMD160 9fe0fe39a9fa8f2fce26f12d0d5caada0a1593cd metadata.xml 252
@@ -92,7 +92,7 @@ SHA256 8f5068c7cc8feea1ac7e67052fdc101ed89033e2ed445c6475bcc91773e5b158 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFH/45AiZjviIA2XgRAvGGAJ9sFMP/WJRnil2O5lHZik+KiXgfEgCgu1mK
-vO/uboWb0XRkfTvYOrUB6Bs=
-=vvat
+iD8DBQFFKOO9AiZjviIA2XgRAsJYAKCNKHaM83teBJZozoY4hDCZTI1VXgCgvibs
+BTJaF2udj9pP93nlJmzGY6Q=
+=Aien
 -----END PGP SIGNATURE-----
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
 }