# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-10-31 02:35:28
# Node ID 747bbbab5f5b293c695800c098aeb02e90ea67d8
# Parent  07ff5926ce6795d7e9b2f48fb506e1e6149fce88

x11-misc/xorg-cf-files: Fix for bug 343461 which fixes a compile error in media-gfx/transfig. Upgrade to EAPI=2 and make ebuild prettier and more fail-fast.

(Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

diff --git a/x11-misc/xorg-cf-files/ChangeLog b/x11-misc/xorg-cf-files/ChangeLog
--- a/x11-misc/xorg-cf-files/ChangeLog
+++ b/x11-misc/xorg-cf-files/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.36 2010/10/17 03:36:12 leio Exp $
 
+  31 Oct 2010; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
+  xorg-cf-files-1.0.3.ebuild, +files/xorg-cf-files-1.0.3-libdir.patch:
+  Fix for bug 343461 which fixes a compile error in media-gfx/transfig.
+  Upgrade to EAPI=2 and make ebuild prettier and more fail-fast.
+
   17 Oct 2010; Mart Raudsepp <leio@gentoo.org> -xorg-cf-files-1.0.2.ebuild:
   Remove old
 
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xorg-cf-files-1.0.3-libdir.patch 561 RMD160 6ad931dbf89b9603e6c3fc40153afbfd7b7fede9 SHA1 40d4d09f648f9b379adf6f62fa5ef35d3a9a5107 SHA256 0c8d2e3ec87a8fec9c7e852fe7d5f7f5e9bf398690e8f09af7c971a668ee91e6
 DIST xorg-cf-files-1.0.3.tar.bz2 342708 RMD160 de867edf4ea02da7fdb45a206076daa96c034029 SHA1 0c63edf6ceeb78fe32dd88bfce8d71c85e311bb0 SHA256 bc32ded8fb8dacdbbe44012ff51e3b797da1f1199cc673bddc3028bec4e1e20b
-EBUILD xorg-cf-files-1.0.3.ebuild 750 RMD160 4ca975252cce516d9cfee4136fffd724dee725c6 SHA1 9ad98533e4ddf1f23d3407168e6d827932b26b99 SHA256 91ec8e745be4b5f14d6058fcfcde76ef435476839329c30f95c71cd7a5601992
-MISC ChangeLog 5324 RMD160 e61bc6835b5ba2b44d16e4460b1a9e5039e04519 SHA1 dd428540d9498a997f03a4f399142418f873838a SHA256 066812b90340615f91c21a31ca7bfe625c836f495b3dce41daeef9f8b884a234
+EBUILD xorg-cf-files-1.0.3.ebuild 829 RMD160 50550bdb75183f53ab34209cbdcd108c1497cddd SHA1 0f548f554e050741f08f8a45ff9b9cfce6d148b9 SHA256 eaf56e86e9f27bd29f78535c4e05fd54f4091944fa59725702484e7030b93a05
+MISC ChangeLog 5608 RMD160 188a896fe1a18ccbee02c2b1cc4015873725be41 SHA1 b656f2dfca658dd98aee1981ff8a1e157507f8c2 SHA256 fb5fde14827f407eafd06d2c0c6c46824f52b4360cf1a3492b6907c5deaa860c
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMzQ4wAAoJEHQ6UuhrqBBQSC4P/3EeGVXqdDiURxda40YHU85q
+UZJwcx8Ha5TLFKqTzMFn8AbJEzL9y3A31EVcXxXEpHxFymxpX3rYZY9Dcv1jWL21
+mmJ/ckzAtOJg1Z8gWe1aulpyRyXX1y0ZU8Mb8pA6m6S6u44DR0rNhqMn5J9PGSll
+aDcdbCJaUgkLHZefGG4ylt3n/48353L+HuXyPhA6K/vE3aw0srWlHGIaFTPCED++
+eRzA7Y44Jpw2SjDh4LOrHjpPt7WxVRsThOG5HN0ZKxCMUd7nGJ4UJG4w10sndmSN
+FeVQ1SQXqgH8LbsLvBSam9+nDw7+kyw/1DQgVD6cCdj8a1MjiWsT3g/29VOJo7jr
+PU2Rg2In7/4V6ExGyuOoTtQ5JwJZq29gcfGkkIdSaxxD4mYdW+BlH+VDTRi85hY4
+eJIO5vRsQce2LoeJM4Rioby5BRnB7ExDVD0Fk9IiZiiEecbCHzDQxd1UxsjJ/X6F
+srtNOs8k2UMJUTHG3JbsUrTR/FUfLtPk3QU7OqOAG9jngO0KAmSB0pfF9VYGlMx5
+Xn8iw1QqZO756fAPsZ660Y4gBZ2Ya5/f+pOzUIGTPKrTHNsDeK2bk49vXFE6N0pk
+5mX60Rj6Xy0PTuLYieehS7OM5C1IPvqeZGzw6NkWOnUD22piARDoElaW0lYoYroV
+n+MvDTpMzSGbar4yaAct
+=xdg/
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.3-libdir.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.3-libdir.patch
new file mode 100644
--- /dev/null
+++ b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.3-libdir.patch
@@ -0,0 +1,17 @@
+diff -c /var/tmp/portage/x11-misc/xorg-cf-files-1.0.3/work.amd64/xorg-cf-files-1.0.3/X11.tmpl /tmp/buffer-content-4693tir
+--- a/X11.tmpl	Wed Oct 14 11:29:25 2009
++++ b/X11.tmpl	Sat Oct 30 22:34:49 2010
+@@ -1461,9 +1461,9 @@
+ #endif
+ #ifndef LibDir
+ # ifdef ProjectRoot
+-#  define LibDir Concat(ProjectRoot,/lib/X11)
++#  define LibDir Concat(Concat(Concat(ProjectRoot,/),LibDirName),/X11)
+ # else
+-#  define LibDir /usr/lib/X11
++#  define LibDir Concat(Concat(/usr/,LibDirName),/X11)
+ # endif
+ #endif
+ #ifndef ModuleDir
+
+Diff finished.  Sat Oct 30 22:34:49 2010
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.3.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.3.ebuild
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.3.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.3.ebuild
@@ -5,17 +5,26 @@
 # Must be before x-modular eclass is inherited
 # SNAPSHOT="yes"
 
-inherit x-modular
+EAPI=2
+
+inherit eutils multilib x-modular
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libdir.patch
+
+	sed -i \
+		-e "s/LibDirName *lib\$/LibDirName $(get_libdir)/" \
+		Imake.tmpl || die "failed LibDirName sed"
+}
+
 src_install() {
 	x-modular_src_install
-	echo "#define ManDirectoryRoot /usr/share/man" >> ${D}/usr/$(get_libdir)/X11/config/host.def
-	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${D}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	echo "#define ManDirectoryRoot /usr/share/man" >> ${D}/usr/$(get_libdir)/X11/config/host.def || die
 }