3 files changed, 42 insertions, 22 deletions
diff --git a/x11-misc/xorg-cf-files/ChangeLog b/x11-misc/xorg-cf-files/ChangeLog
index 8f02754a6548..c77d7d29f95b 100644
--- a/x11-misc/xorg-cf-files/ChangeLog
+++ b/x11-misc/xorg-cf-files/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xorg-cf-files
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.48 2013/05/28 21:17:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.49 2013/07/24 00:18:06 chithanh Exp $
+
+*xorg-cf-files-1.0.5 (24 Jul 2013)
+
+  24 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-cf-files-1.0.5.ebuild:
+  Version bump.
 
 *xorg-cf-files-1.0.4-r1 (28 May 2013)
 
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 2969623d2270..ca155cdecf80 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX xorg-cf-files-1.0.2-solaris-prefix.patch 23137 SHA256 5270962cfdc9f815fa61922c2b1388bd5e9b90aa053fbdcdd12828cdabce7799 SHA512 96c01caab1cc77a16e4e103e57a625df3fa6dea399a6ac7df64f821b20edec8025d8d7bd6f1e15a5e2509d3032726eee15710ca5f354e2fd7f0a33a569fa336f WHIRLPOOL 56c4d7cef47dc3fb031a67e9d2ccebb817d013a129abb68ba7010bef91f45ef7e237f5204443c360aa8fb1cedf56f15a16334446d56c8470eaba0174c6a0fc0a
 DIST xorg-cf-files-1.0.4.tar.bz2 367380 SHA256 36e9ce83e4978f59909c6f44c43002d9b240ae66e23984ea1086f0b18c810669 SHA512 e00ba2273b8ec7ca4ae84c176075170ae74162064463e9b48fb5c6ad62f7984a93fafa626caf0a9079b796f4deec57759a1d0fc148e77793eae130a9441baf42 WHIRLPOOL bee8bd9b8b72e19bf1429aefe86db6b4eed39132e4080f9e3c9a4acb9d6b40e73e5d6dfd75304d29654feaa4c88f64ffd34c097896417ab3285e10090c3915ff
+DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c WHIRLPOOL 8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b
 EBUILD xorg-cf-files-1.0.4-r1.ebuild 1853 SHA256 ada02742d50df59a878cf8e2abe4509dfca1bdd4eaaf86e902b654c63faebaa5 SHA512 51f274dcba58dbcfd564cb26c73c7b1c33f21f1836dbb9c7ca1d48a44bce95bd1611429ea2766e833e24fcc30fe83167e998139d8e8f572c2d1a5cf3c1fb2c68 WHIRLPOOL a1d4e1f015c6ef7e4d27de8efb9ce472afa861fd700e8acf47bfeddc8739e03af2cbcd05870d4d5db6932feefdc6788c8153292a0de14fcf5a479034782c3698
 EBUILD xorg-cf-files-1.0.4.ebuild 1362 SHA256 d440243ae01c1bf5719e4ef01203634e466ecac45f8c59ad53153ad51d87afc3 SHA512 1e2be2b9c913a698c7dd74b51fd7a77f6c769a85ecc161087014807656fc5b753a83e7f353b97533eda2e39ef50c479bd24399bec7a778098ec532548872e80a WHIRLPOOL b491740a6a3ffc62e1bf968e893ef22c225c209d112325b1083eb600a92e208f19b5768e5bb189894342e3611e51ef9cc7ce518912604b9ee92e97e52b28bb62
-MISC ChangeLog 6794 SHA256 991b425efe2fccda804db4d9727fad18d0a0c868421a9cbf3e6ddb11c6f95fe5 SHA512 4702fb5a8e0d9ff8efc573622fb236f7d667172d14aa3ffa66be0d030b37bdf399fda892be6b87e580884a5e7ea287bcbc2be824823ea828693f728039b7b57e WHIRLPOOL 202cf08ea3ef55ed28cc258a7b963ddb89949625413f92dba2cedde066fcf3a23215f69f762efedea8efd01d00afe9566ffbeeca37316524bf2b8ab232a127b4
+EBUILD xorg-cf-files-1.0.5.ebuild 1850 SHA256 bbea04a8b9aa25a37070d42ceca71f2e796295a2cdecbd508a0a6294bfdc9c37 SHA512 d98db031c39690a8fe21f2495b0b90c4a5995c8847a989a9eb556dee76ddd4f7eb00542c65300c5759375bcc6a9f3cf35ad2f86f61c4007ee8dde6625bf70c12 WHIRLPOOL e9376a436951d7b4803443bac5bd6fa8e28d90c8b1a53fd4e9db333ed88847ae5f7d8bdefa58fc7ffdace8ff92fd592313f726f6f0ee15605e21a45bab323ac6
+MISC ChangeLog 6947 SHA256 a58c868ceab7511a9a4f2e7eb1ff76628790e64cc3f854c3cff4cfd0ee409fc6 SHA512 723b973199a5d2cf580d88b3565eb417c277de6fa2a372fbcf1d5cc28d7879285d59fff1497a69695727ae575baa6fa1cf6ce99e7c150ad4e05cb51d7f0249c1 WHIRLPOOL 872180375eac77a79adca6e55838c208e8b23c74e6a8f5d1f422e0a2d631d702f3cc1be5cb6c4bca5e04854bd3fd8320726a61dd7232346a61c4a400eaab3b96
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRpR8UAAoJEJOE+m71LUu6wn4P/RVRMn+uZEgweT5NSkQB65I7
-DN8qKb/ajy6j9zuxBrJNfe8JwktCrfQnJRciFXHy/+wvsv1QIJX6QwGWpLHzX3WS
-GzDxegaI+N3Tk6nsCnFiB9mopUs1oJEXKpieWW3avMSmfjV/gYFTba7cgbzKO8Z5
-EM1XYJBu2HXwTNXhlvg2pYszKIYKBQGP1q9wA6r56gnM0P+cIQ5v1EMQbrM7k33y
-oamsI2/84spBzGm4Js2KH5PwzhOihW9R+Ez+cHkIHjfa5TwrH8PWxcc9ufvSx04G
-sk2tBMTPe+IR9yfTqT9DU6FQXtn3uQ1K5uFAH9JnVGjz+QRpzTFWt8A+abZdOH9H
-vq4lDfwhD4dNTjwujdfYfQmCFc25trvwRc5Eqmb/45Ziq3t4zKrA4YflFfLa42SP
-EEWHULibSBh/A05dqUGedgsA8ud6mlh8EbIRRzPoR2iCo3wrSmO1Zt/DOR6DZAd+
-LSdFjXsWBz3mTM1dgKrLo/GG7Dpyc3VmJkpaNxKTCz0XAzU2n4XbE+ZFZDgsriHB
-diNWgFmaCcR7ri2WUEH8aCNBk2VG4nk5aCC9wAfWnTgk1HJZlyt2TesWAVmeU1Xf
-G2iOZ48OvSSm0LjIMOrwP9NjJu1OmFX2sABkVVjdp2aI2711kcIujN2jFW5QmYN1
-c7YGBbQcVUqgWhYlEHME
-=bLkd
------END PGP SIGNATURE-----
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
new file mode 100644
index 000000000000..64a62243e5ef
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild,v 1.1 2013/07/24 00:18:06 chithanh Exp $
+
+EAPI="5"
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+	xorg-2_src_install
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+	sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+
+	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+}