(#127143) Find a real XvMCConfig file.

Package-Manager: portage-2.1_pre6-r3

6 files changed, 43 insertions, 28 deletions

diff --git a/x11-libs/libXvMC/ChangeLog b/x11-libs/libXvMC/ChangeLog
index 794fe65ab73a..67544ffc87e1 100644
--- a/x11-libs/libXvMC/ChangeLog
+++ b/x11-libs/libXvMC/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXvMC
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/ChangeLog,v 1.15 2006/02/15 20:19:38 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/ChangeLog,v 1.16 2006/03/22 18:13:56 spyderous Exp $
+
+*libXvMC-1.0.1-r1 (22 Mar 2006)
+
+  22 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/1.0.1-xvmc-xconfigdir.patch, -libXvMC-1.0.1.ebuild,
+  +libXvMC-1.0.1-r1.ebuild:
+  (#127143) Find a real XvMCConfig file.
 
   15 Feb 2006; Stefaan De Roeck <stefaan@gentoo.org> libXvMC-1.0.1.ebuild:
   Marked ~alpha (bug #122726)
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index e48d8fdc145d..10146879181c 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ee6e96f8fec75af0a12da78c16044988 ChangeLog 2064
-RMD160 6ae614b9f3fb2519eddbcc33fd932e83f3fc7251 ChangeLog 2064
-SHA256 5f4ba8f6baca5e3c2147b52d89134bb5463d158294a48cdac261558cdd801fac ChangeLog 2064
-MD5 f41c12a94117d529f33b2b5856d51df1 files/digest-libXvMC-1.0.1 66
-RMD160 a7fbe7fd77603ff00a071ce6591d37600fb4cc9e files/digest-libXvMC-1.0.1 66
-SHA256 de132149218e5fec76afa10397b662509672c4aa981f10a4e3fa26fabfa7fffc files/digest-libXvMC-1.0.1 66
-MD5 7ef63dd8cc3e3d3600933252a07e451b libXvMC-1.0.1.ebuild 671
-RMD160 1b93fad63dcdf62239266af3f8ef6c7201eafb4b libXvMC-1.0.1.ebuild 671
-SHA256 1899a2cef07a90394530dbc51b7ab2920f77565cf935bd8481fcb3658a2e9cef libXvMC-1.0.1.ebuild 671
+MD5 b3d126cb5cd70081e7e22683bfaccde8 ChangeLog 2285
+RMD160 a98e565add03a60d38e40a23257297a78d753bc3 ChangeLog 2285
+SHA256 4cdf97d37c67936eb91687f27670e990b24810f89625b18292aac906ef5eb710 ChangeLog 2285
+MD5 b472290d30baaf0013d50bf2a93ba78a files/1.0.1-xvmc-xconfigdir.patch 546
+RMD160 d6b25d8e30cbd4fe8c9f69c57d14e8fee5310d8b files/1.0.1-xvmc-xconfigdir.patch 546
+SHA256 ce99504084364e3012efc1f1b5cab93839f38d4a36398a65b4618ed0851255df files/1.0.1-xvmc-xconfigdir.patch 546
+MD5 ca15682efc79ff3a8b30134816b58ee0 files/digest-libXvMC-1.0.1-r1 244
+RMD160 3a8ead322aafa5180fefd8701fa63d54faadf2c7 files/digest-libXvMC-1.0.1-r1 244
+SHA256 f293ca3d93d76991a9fccdc17384f62953c0c646f44dcfed84366feec133e317 files/digest-libXvMC-1.0.1-r1 244
+MD5 c9cf418f6bc8fee037ba8e9b3b2335ee libXvMC-1.0.1-r1.ebuild 614
+RMD160 d213b559941ea91a326951c1b0b91046fbe4ab84 libXvMC-1.0.1-r1.ebuild 614
+SHA256 770bfc23dc9d024e16c9beb15e563079748bd6443d6440c8ba7e504d5a50a10c libXvMC-1.0.1-r1.ebuild 614
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD/UpR2+ySkm8kpY0RAqKpAKCT3xaoPor15HndYc4NkKnupE7LuACgnuGd
-uHNzQsko511lHqJ+pLIDkp0=
-=3HRU
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXvMC/files/1.0.1-xvmc-xconfigdir.patch b/x11-libs/libXvMC/files/1.0.1-xvmc-xconfigdir.patch
new file mode 100644
index 000000000000..06aa19cd4752
--- /dev/null
+++ b/x11-libs/libXvMC/files/1.0.1-xvmc-xconfigdir.patch
@@ -0,0 +1,17 @@
+? xvmc-xconfigdir.patch
+Index: src/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/lib/XvMC/src/Makefile.am,v
+retrieving revision 1.7
+diff -u -b -B -r1.7 Makefile.am
+--- src/Makefile.am	3 Dec 2005 04:41:51 -0000	1.7
++++ src/Makefile.am	22 Mar 2006 17:40:48 -0000
+@@ -15,7 +15,7 @@
+ libXvMCW_la_LIBADD = @XVMC_LIBS@
+ libXvMCW_la_CFLAGS =				\
+ 	$(AM_CFLAGS)				\
+-	-DXVMC_CONFIGDIR=XConfigDir		\
++	-DXVMC_CONFIGDIR=$(sysconfdir)/X11		\
+ 	-DXVMC_SOVERSION=\".1.0\"		\
+ 	-DXV_SOVERSION=\".1.0\"
+ 
diff --git a/x11-libs/libXvMC/files/digest-libXvMC-1.0.1 b/x11-libs/libXvMC/files/digest-libXvMC-1.0.1
deleted file mode 100644
index e72b676500db..000000000000
--- a/x11-libs/libXvMC/files/digest-libXvMC-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e8e6fee2617abf589f08aea69f4fb43 libXvMC-1.0.1.tar.bz2 218781
diff --git a/x11-libs/libXvMC/files/digest-libXvMC-1.0.1-r1 b/x11-libs/libXvMC/files/digest-libXvMC-1.0.1-r1
new file mode 100644
index 000000000000..490c0d0a1d46
--- /dev/null
+++ b/x11-libs/libXvMC/files/digest-libXvMC-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 9e8e6fee2617abf589f08aea69f4fb43 libXvMC-1.0.1.tar.bz2 218781
+RMD160 a36a65d7c5555e8ef8a9b62d4c96affacb3740b3 libXvMC-1.0.1.tar.bz2 218781
+SHA256 a66e75f358d6c50d7cce86353a8d908bc453b3b0e4fc526fa4edf657d7a6a37c libXvMC-1.0.1.tar.bz2 218781
diff --git a/x11-libs/libXvMC/libXvMC-1.0.1.ebuild b/x11-libs/libXvMC/libXvMC-1.0.1-r1.ebuild
index 403af2da5a6c..db3e474af295 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.1.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.1-r1.ebuild
@@ -1,19 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.1.ebuild,v 1.5 2006/02/23 05:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.1-r1.ebuild,v 1.1 2006/03/22 18:13:56 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
 DESCRIPTION="X.Org XvMC library"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-#IUSE="X gnome"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXv
@@ -21,3 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-proto/xproto"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto"
+PATCHES="${FILESDIR}/${PV}-xvmc-xconfigdir.patch"