add patch for compatibility with xorg-server-1.4 from conary

Package-Manager: portage-2.1.4_rc14

5 files changed, 174 insertions, 16 deletions

diff --git a/dev-python/pyxf86config/ChangeLog b/dev-python/pyxf86config/ChangeLog
index 3ed9948e35f3..1d2c7d2b3f7a 100644
--- a/dev-python/pyxf86config/ChangeLog
+++ b/dev-python/pyxf86config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyxf86config
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.5 2007/10/15 10:23:41 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.6 2008/01/13 02:00:30 compnerd Exp $
+
+*pyxf86config-0.3.34-r1 (13 Jan 2008)
+
+  13 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/xorg-server-1.4-compat.patch, +pyxf86config-0.3.34-r1.ebuild:
+  Revbump with patch for xorg-server-1.4 from conary
 
 *pyxf86config-0.3.34 (15 Oct 2007)
 
diff --git a/dev-python/pyxf86config/Manifest b/dev-python/pyxf86config/Manifest
index 7af4ad5d20b6..a02db87513a8 100644
--- a/dev-python/pyxf86config/Manifest
+++ b/dev-python/pyxf86config/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xorg-server-1.4-compat.patch 3386 RMD160 eb1597c4ec05069a9bb4eabac87e50b49d1484dc SHA1 e1d2d9c1f6298b6ec0589910db136610f7e5a14c SHA256 1a398006540986dbed9d61a85623054c6614d64bf2e832cd02e956b6f4082317
+MD5 1c1949616c5903e96689f2082921d8ee files/xorg-server-1.4-compat.patch 3386
+RMD160 eb1597c4ec05069a9bb4eabac87e50b49d1484dc files/xorg-server-1.4-compat.patch 3386
+SHA256 1a398006540986dbed9d61a85623054c6614d64bf2e832cd02e956b6f4082317 files/xorg-server-1.4-compat.patch 3386
 DIST pyxf86config-0.3.30-1.fc6.src.rpm 338814 RMD160 9e13df300eb454b0cdd6e7782a908ebaf1cd523e SHA1 c02a535fed6e1256984960a9e14927a3267f749f SHA256 1ebd34e6832fa660fcfd34e22239c95331db3577d99e86a551a6e433315b2026
 DIST pyxf86config-0.3.33-1.fc7.src.rpm 251535 RMD160 76910552760a6442f75e6c944c0c68242a65dbd9 SHA1 7ed0a19c42dd6e90e1c224c388b3a371127f80b7 SHA256 a6e24392a2ecafbce3eec3c62b5550e95d433791c8966cc4026255a9e113c6dc
 DIST pyxf86config-0.3.34-1.fc8.src.rpm 252972 RMD160 57c0d00e4f4e81f49a5ecd6e56dbb308f0d9c3bc SHA1 15833e4c13a969370fa73afc9a372178bbc424a2 SHA256 ea9486bde7f80ba427964d70fda7c2497a60463068e8d403177a68385b69481b
@@ -12,14 +13,18 @@ EBUILD pyxf86config-0.3.33.ebuild 973 RMD160 e141066ee2296a6925242844b1a95c74eaf
 MD5 f03c540374084c13e7f22e0413c6951c pyxf86config-0.3.33.ebuild 973
 RMD160 e141066ee2296a6925242844b1a95c74eaf88747 pyxf86config-0.3.33.ebuild 973
 SHA256 7b866b10aacbed5f4ef38f2fd87f472f5754e121159b1a87e4a04c5c8bedbec6 pyxf86config-0.3.33.ebuild 973
+EBUILD pyxf86config-0.3.34-r1.ebuild 1139 RMD160 5d4ed3a91046f9786e24c56798c6556952a59251 SHA1 6ea7f8d3f57e4ec76de35ff271823abc54b4a7a4 SHA256 dd7c3b5d7a0e2fdaccd77c07013b698c4f98c92e1c12eb361df903df993c4307
+MD5 8bbd08f048347ab0bc90c69f640efba6 pyxf86config-0.3.34-r1.ebuild 1139
+RMD160 5d4ed3a91046f9786e24c56798c6556952a59251 pyxf86config-0.3.34-r1.ebuild 1139
+SHA256 dd7c3b5d7a0e2fdaccd77c07013b698c4f98c92e1c12eb361df903df993c4307 pyxf86config-0.3.34-r1.ebuild 1139
 EBUILD pyxf86config-0.3.34.ebuild 977 RMD160 cc185680347808790d5a0701a836f8e26f5c69b4 SHA1 35797e6f6cfadf1d40fa0a142a9120cc1c4b42a4 SHA256 2d6a0c52653723551cf9651ccbb6d415434edb12fc8638ca8cd87c14fe0c1974
 MD5 d68c5142a39f588346a40b10a7e5f52e pyxf86config-0.3.34.ebuild 977
 RMD160 cc185680347808790d5a0701a836f8e26f5c69b4 pyxf86config-0.3.34.ebuild 977
 SHA256 2d6a0c52653723551cf9651ccbb6d415434edb12fc8638ca8cd87c14fe0c1974 pyxf86config-0.3.34.ebuild 977
-MISC ChangeLog 1072 RMD160 ce5bfb65cabd907b019b3ad10d61fae5badc2903 SHA1 9b47cd767f4ac6c4b0ddb38d67c17522f95ce0b8 SHA256 ca10b33d67ea5b2060e93910458d74659d64d42741849c2053fb6d6ee55f4f02
-MD5 14371102bf7aba7f5520df64e2bceb95 ChangeLog 1072
-RMD160 ce5bfb65cabd907b019b3ad10d61fae5badc2903 ChangeLog 1072
-SHA256 ca10b33d67ea5b2060e93910458d74659d64d42741849c2053fb6d6ee55f4f02 ChangeLog 1072
+MISC ChangeLog 1291 RMD160 872c90749758073e0634ceac86953d1ab9591a41 SHA1 5d5ef0e6aa5fa8a82147c85af47c2e4ba3f9463f SHA256 cc6a557794dac71dd08f7cb3b20f91b06c83976042aad20e6949dd07c8685cf0
+MD5 4bb0316dd5ceb4cbd51389d479ce9651 ChangeLog 1291
+RMD160 872c90749758073e0634ceac86953d1ab9591a41 ChangeLog 1291
+SHA256 cc6a557794dac71dd08f7cb3b20f91b06c83976042aad20e6949dd07c8685cf0 ChangeLog 1291
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
 MD5 4f7fe0eacb3ba0ef618e04831e4a7517 metadata.xml 252
 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 metadata.xml 252
@@ -33,10 +38,6 @@ SHA256 acfc9ed4244ea06f0f5716d0283b2e5a11291df855b1e539761b2149ff34f63a files/di
 MD5 d6be72277793e3741f40ebb3663f2266 files/digest-pyxf86config-0.3.34 280
 RMD160 cb86076613ce0e0b9fe485a1fee0715c7d98dc40 files/digest-pyxf86config-0.3.34 280
 SHA256 769c60eb8bee97cba0fad08516a869c11315712f3c091716afaead7640fd160b files/digest-pyxf86config-0.3.34 280
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHEz+3XVaO67S1rtsRAvE0AJ9sEwR9klbstfUFjOPl7InbeQWxEwCgyti5
-pMAMenhastOMaJpAQeI1sv8=
-=gWPy
------END PGP SIGNATURE-----
+MD5 d6be72277793e3741f40ebb3663f2266 files/digest-pyxf86config-0.3.34-r1 280
+RMD160 cb86076613ce0e0b9fe485a1fee0715c7d98dc40 files/digest-pyxf86config-0.3.34-r1 280
+SHA256 769c60eb8bee97cba0fad08516a869c11315712f3c091716afaead7640fd160b files/digest-pyxf86config-0.3.34-r1 280
diff --git a/dev-python/pyxf86config/files/digest-pyxf86config-0.3.34-r1 b/dev-python/pyxf86config/files/digest-pyxf86config-0.3.34-r1
new file mode 100644
index 000000000000..96164bf4e02b
--- /dev/null
+++ b/dev-python/pyxf86config/files/digest-pyxf86config-0.3.34-r1
@@ -0,0 +1,3 @@
+MD5 1b5de8519adac080bdc8705924ce26cf pyxf86config-0.3.34-1.fc8.src.rpm 252972
+RMD160 57c0d00e4f4e81f49a5ecd6e56dbb308f0d9c3bc pyxf86config-0.3.34-1.fc8.src.rpm 252972
+SHA256 ea9486bde7f80ba427964d70fda7c2497a60463068e8d403177a68385b69481b pyxf86config-0.3.34-1.fc8.src.rpm 252972
diff --git a/dev-python/pyxf86config/files/xorg-server-1.4-compat.patch b/dev-python/pyxf86config/files/xorg-server-1.4-compat.patch
new file mode 100644
index 000000000000..25aad1db9b98
--- /dev/null
+++ b/dev-python/pyxf86config/files/xorg-server-1.4-compat.patch
@@ -0,0 +1,103 @@
+diff -ruN pyxf86config-0.3.32.orig/xf86config_ext.c pyxf86config-0.3.32/xf86config_ext.c
+--- pyxf86config-0.3.32.orig/xf86config_ext.c	2007-10-10 16:11:22.000000000 -0400
++++ pyxf86config-0.3.32/xf86config_ext.c	2007-10-11 10:26:05.000000000 -0400
+@@ -42,16 +42,12 @@
+ void
+ xf86freeVideoAdaptor (XF86ConfVideoAdaptorPtr ptr)
+ {
+-  TestFree (ptr->va_identifier);
+-  TestFree (ptr->va_vendor);
+-  TestFree (ptr->va_board);
+-  TestFree (ptr->va_busid);
+-  TestFree (ptr->va_driver);
+-  TestFree (ptr->va_fwdref);
+-  TestFree (ptr->va_comment);
+-  xf86freeVideoPortList (ptr->va_port_lst);
+-  xf86optionListFree (ptr->va_option_lst);
+-  xf86conffree (ptr);
++  XF86ConfVideoAdaptorPtr ptr2;
++
++  ptr2 = ptr->list.next;
++  ptr->list.next = NULL;
++  xf86freeVideoAdaptorList(ptr);
++  ptr->list.next = ptr2;
+ }
+ 
+ void
+@@ -66,10 +62,12 @@
+ void
+ xf86freeModes (XF86ConfModesPtr ptr)
+ {
+-  TestFree (ptr->modes_identifier);
+-  TestFree (ptr->modes_comment);
+-  xf86freeModeLineList (ptr->mon_modeline_lst);
+-  xf86conffree (ptr);
++  XF86ConfModesPtr ptr2;
++
++  ptr2 = ptr->list.next;
++  ptr->list.next = NULL;
++  xf86freeModesList(ptr);
++  ptr->list.next = ptr2;
+ }
+ 
+ void
+@@ -84,13 +82,12 @@
+ void
+ xf86freeMonitor (XF86ConfMonitorPtr ptr)
+ {
+-  TestFree (ptr->mon_identifier);
+-  TestFree (ptr->mon_vendor);
+-  TestFree (ptr->mon_modelname);
+-  TestFree (ptr->mon_comment);
+-  xf86optionListFree (ptr->mon_option_lst);
+-  xf86freeModeLineList (ptr->mon_modeline_lst);
+-  xf86conffree (ptr);
++  XF86ConfMonitorPtr ptr2;
++
++  ptr2 = ptr->list.next;
++  ptr->list.next = NULL;
++  xf86freeMonitorList(ptr);
++  ptr->list.next = ptr2;
+ }
+ 
+ void
+@@ -182,11 +179,12 @@
+ void
+ xf86freeLayout (XF86ConfLayoutPtr ptr)
+ {
+-  TestFree (ptr->lay_identifier);
+-  TestFree (ptr->lay_comment);
+-  xf86freeAdjacencyList (ptr->lay_adjacency_lst);
+-  xf86freeInputrefList (ptr->lay_input_lst);
+-  xf86conffree (ptr);
++  XF86ConfLayoutPtr ptr2;
++
++  ptr2 = ptr->list.next;
++  ptr->list.next = NULL;
++  xf86freeLayoutList(ptr);
++  ptr->list.next = ptr2;
+ }
+ 
+ void
+Files pyxf86config-0.3.32.orig/.xf86config_ext.c.swp and pyxf86config-0.3.32/.xf86config_ext.c.swp differ
+diff -ruN pyxf86config-0.3.32.orig/xf86ParserExt.h pyxf86config-0.3.32/xf86ParserExt.h
+--- pyxf86config-0.3.32.orig/xf86ParserExt.h	2007-10-10 16:11:22.000000000 -0400
++++ pyxf86config-0.3.32/xf86ParserExt.h	2007-10-10 17:06:40.000000000 -0400
+@@ -4,13 +4,14 @@
+ extern void xf86freeFiles (XF86ConfFilesPtr p);
+ extern void xf86freeModules (XF86ConfModulePtr ptr);
+ extern void xf86freeFlags (XF86ConfFlagsPtr flags);
+-extern void xf86freeVideoPortList (XF86ConfVideoPortPtr ptr);
+-extern void xf86freeModeLineList (XF86ConfModeLinePtr ptr);
++extern void xf86freeVideoAdaptorList (XF86ConfVideoAdaptorPtr ptr);
++extern void xf86freeMonitorList (XF86ConfMonitorPtr ptr);
++extern void xf86freeModesList (XF86ConfModesPtr ptr);
+ extern void xf86freeModeList (XF86ModePtr ptr);
+ extern void xf86optionListFree (XF86OptionPtr opt);
+ extern void xf86freeAdaptorLinkList (XF86ConfAdaptorLinkPtr ptr);
+ extern void xf86freeDisplayList (XF86ConfDisplayPtr ptr);
+-extern void xf86freeInputrefList (XF86ConfInputrefPtr ptr);
++extern void xf86freeLayoutList (XF86ConfLayoutPtr ptr);
+ extern void xf86freeAdjacencyList (XF86ConfAdjacencyPtr ptr);
+ extern void xf86freeDRI (XF86ConfDRIPtr ptr);
+ extern void xf86freeVendorSubList (XF86ConfVendSubPtr ptr);
diff --git a/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild b/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild
new file mode 100644
index 000000000000..2fe939269590
--- /dev/null
+++ b/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild
@@ -0,0 +1,45 @@
+# 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.1 2008/01/13 02:00:30 compnerd Exp $
+
+inherit eutils python rpm
+
+# Tag for which Fedora Core version it's from
+FCVER="8"
+
+# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
+# tarball out of it
+RPMREV="1"
+
+DESCRIPTION="Python wrappers for libxf86config"
+HOMEPAGE="http://fedoraproject.org/wiki/SystemConfig/"
+SRC_URI="mirror://fedora-dev/development/source/SRPMS/${P}-${RPMREV}.fc${FCVER}.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+RDEPEND="=dev-libs/glib-2*
+		  dev-lang/python"
+DEPEND="${RDEPEND}
+		>=x11-base/xorg-server-1.1.1-r1"
+
+src_unpack() {
+	rpm_src_unpack
+	cd "${S}"
+
+	if has_version '>=x11-base/xorg-server-1.4' ; then
+		epatch "${FILESDIR}/xorg-server-1.4-compat.patch"
+	fi
+}
+
+src_compile() {
+	python_version
+	econf --with-python-version=${PYVER} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}