(#206989) Fix for amd64 by using rewritten Makefile.am (Dough Klima and me). Also fix for xorg-server 1.5 by removing knowledge of RgbPath.

Package-Manager: portage-2.1.4.4

5 files changed, 53 insertions, 5 deletions

diff --git a/dev-python/pyxf86config/ChangeLog b/dev-python/pyxf86config/ChangeLog
index e226d264231e..8fe7db7e816f 100644
--- a/dev-python/pyxf86config/ChangeLog
+++ b/dev-python/pyxf86config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyxf86config
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.8 2008/02/14 02:50:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.9 2008/03/19 07:46:14 dberkholz Exp $
+
+  19 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.3.34-remove-rgbpath.patch, +files/Makefile.am,
+  pyxf86config-0.3.34-r1.ebuild:
+  (#206989) Fix for amd64 by using rewritten Makefile.am (Dough Klima and
+  me). Also fix for xorg-server 1.5 by removing knowledge of RgbPath.
 
   14 Feb 2008; Robin H. Johnson <robbat2@gentoo.org>
   pyxf86config-0.3.34-r1.ebuild:
diff --git a/dev-python/pyxf86config/Manifest b/dev-python/pyxf86config/Manifest
index 075936bfdc6a..27faacb99c83 100644
--- a/dev-python/pyxf86config/Manifest
+++ b/dev-python/pyxf86config/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.3.34-remove-rgbpath.patch 679 RMD160 62f466be39a1a06d2a72d6cbf0a24aae8417e42b SHA1 ab9265eaeeea14de5edffa9c2efea104af67ae2f SHA256 a52c485fc3e9b90cda5c729df88a8dc16a0d4b47bf258b1cfc61c15e467114c8
+AUX Makefile.am 452 RMD160 17d5221814db6d90ac6f636b059ed7fb8574f421 SHA1 da65727e13559eff5f2838234d778acc439b6237 SHA256 85a2535526270dd55fee9ab92c7fcfeafc585fe8d2593dd0d3edd82a0f90ae0d
 AUX xorg-server-1.4-compat.patch 3386 RMD160 eb1597c4ec05069a9bb4eabac87e50b49d1484dc SHA1 e1d2d9c1f6298b6ec0589910db136610f7e5a14c SHA256 1a398006540986dbed9d61a85623054c6614d64bf2e832cd02e956b6f4082317
 DIST pyxf86config-0.3.34-1.fc8.src.rpm 252972 RMD160 57c0d00e4f4e81f49a5ecd6e56dbb308f0d9c3bc SHA1 15833e4c13a969370fa73afc9a372178bbc424a2 SHA256 ea9486bde7f80ba427964d70fda7c2497a60463068e8d403177a68385b69481b
-EBUILD pyxf86config-0.3.34-r1.ebuild 1145 RMD160 d0b6162f9badc62abf35dcd13121188cd4a2884f SHA1 820687e71f6982c33171edc189c87423bf343333 SHA256 ef3c0f5c083be15a1fe5c812549e8256ad013750f3d8382a962693f1ef6d9709
-MISC ChangeLog 1558 RMD160 17ea5fb718b330368a27d3357ab712c3db23e968 SHA1 9efccb3452370fe8ef0703025a8edd97b602b923 SHA256 1797e45bad3f66d907e9706862b9679f749d8a4998959a54eb5c66dfdda5cd6e
+EBUILD pyxf86config-0.3.34-r1.ebuild 1352 RMD160 1fbdbcd5abeb89b4b685ffcf61b26fa78b33d669 SHA1 ca9386dea8eff370e672d64873c4ab4b9bd0e26b SHA256 958540c09ee8fc473848906684eed3127111aea460c838a369dfee7941b83270
+MISC ChangeLog 1851 RMD160 4d0f8abd1fc421bde3116f0a2f0363161cfa68e1 SHA1 f989652977318f52be6f823f0400f7758bbc63cb SHA256 3b836dde0c6690b55f0254a0868c79f85a970ebe8238960d54d253de9ff9cfb0
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH4MTLXVaO67S1rtsRAjW/AKDE7n34J5xNvwzIW3qTbq49ZnZhSgCcC0e+
+37jAJhQJoxIXQlYszfSsenw=
+=P0u2
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyxf86config/files/0.3.34-remove-rgbpath.patch b/dev-python/pyxf86config/files/0.3.34-remove-rgbpath.patch
new file mode 100644
index 000000000000..f9e6a9e60ea3
--- /dev/null
+++ b/dev-python/pyxf86config/files/0.3.34-remove-rgbpath.patch
@@ -0,0 +1,11 @@
+diff -u pyxf86config-0.3.34.orig/pyxf86conf.c pyxf86config-0.3.34/pyxf86conf.c
+--- pyxf86config-0.3.34.orig/pyxf86conf.c	2008-03-19 00:13:41.000000000 -0700
++++ pyxf86config-0.3.34/pyxf86conf.c	2008-03-19 00:13:59.000000000 -0700
+@@ -1700,7 +1700,6 @@
+ 
+ WrapperAttribute files_attributes[] = {
+   { "logfile", offsetof(XF86ConfFilesRec,file_logfile), ATTRIBUTE_STRING},
+-  { "rgbpath", offsetof(XF86ConfFilesRec,file_rgbpath), ATTRIBUTE_STRING},
+   { "module", offsetof(XF86ConfFilesRec,file_modulepath), ATTRIBUTE_STRING},
+   { "fontpath", offsetof(XF86ConfFilesRec,file_fontpath), ATTRIBUTE_STRING},
+   { "comment", offsetof(XF86ConfFilesRec,file_comment), ATTRIBUTE_STRING},
diff --git a/dev-python/pyxf86config/files/Makefile.am b/dev-python/pyxf86config/files/Makefile.am
new file mode 100644
index 000000000000..c405c444a02f
--- /dev/null
+++ b/dev-python/pyxf86config/files/Makefile.am
@@ -0,0 +1,12 @@
+AM_CFLAGS = -fvisibility=hidden
+
+INCLUDES = -I@PYTHON_INC@ @GLIB_CFLAGS@ @X_CFLAGS@ @XORG_SERVER_CFLAGS@
+
+pythondir = $(libdir)/python@PYTHON_VERSION@/site-packages
+
+python_LTLIBRARIES = ixf86configmodule.la
+dist_python_DATA = xf86config.py
+
+ixf86configmodule_la_SOURCES = pyxf86conf.h pyxf86conf.c xf86ParserExt.h xf86config_ext.c
+ixf86configmodule_la_LDFLAGS = -module -shared -avoid-version
+ixf86configmodule_la_LIBADD = @GOBJECT_LIBS@ -lxf86config
diff --git a/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild b/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild
index e92f9d9b4d4c..db0fb9600b04 100644
--- a/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild
+++ b/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild,v 1.2 2008/02/14 02:50:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild,v 1.3 2008/03/19 07:46:14 dberkholz Exp $
 
-inherit eutils python rpm
+inherit eutils python rpm autotools
 
 # Tag for which Fedora Core version it's from
 FCVER="8"
@@ -32,6 +32,13 @@ src_unpack() {
 	if has_version '>=x11-base/xorg-server-1.4' ; then
 		epatch "${FILESDIR}/xorg-server-1.4-compat.patch"
 	fi
+
+	# Compat with 1.5
+	epatch "${FILESDIR}"/0.3.34-remove-rgbpath.patch
+
+	# (#206989) Cleaned up Makefile.am that works correctly on amd64
+	cp "${FILESDIR}"/Makefile.am "${S}"/ || die
+	eautoreconf
 }
 
 src_compile() {