Fix src_install to append to, not overwrite host.def to set ManDirectoryRoot.

Package-Manager: portage-2.1_pre10-r2

3 files changed, 23 insertions, 30 deletions

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 87c0bf8e3295..b6f55fc936ee 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,12 +1,26 @@
-MD5 21fdfddc630cea6ea4a72cb63caf4d1c ChangeLog 2759
-RMD160 5e4b8bf2f8400619c2861154a2aecf84b7066dd3 ChangeLog 2759
-SHA256 e4ac4d297c454062dd0468117d497f6fb8db3c1491f477ef8ceee226e6f5cf8f ChangeLog 2759
-MD5 6a9e9624b3fd7590d177806fbada249c files/digest-xorg-cf-files-1.0.1-r2 72
-RMD160 7893e440316ee6f1c25a7475d75b60aeafce808d files/digest-xorg-cf-files-1.0.1-r2 72
-SHA256 591249ea40a12b7de1e42d59bcb598cde7fed29590a0fdde9a36811e250431b2 files/digest-xorg-cf-files-1.0.1-r2 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST xorg-cf-files-1.0.1.tar.bz2 263753 RMD160 08daeb2ef3fc1aca030f36f25d89dc4507f9cbc5 SHA256 af407f43cb730b99ec7266de69dc2231ed628d4abf8f222a922f0627e84818ea size 263753
+EBUILD xorg-cf-files-1.0.1-r3.ebuild 698 RMD160 32f0224812c3d39bd11f45f03631f1b663044e3b SHA1 1e290223ff3a7fb4f0377deefb4912c371344cac SHA256 67887a85c45116254d02bde9053af1752b57f8e4c45b91c3e19e00dd6036c766 size 698
+MD5 45a7ae2a60916bee8098badccdbbf818 xorg-cf-files-1.0.1-r3.ebuild 698
+RMD160 32f0224812c3d39bd11f45f03631f1b663044e3b xorg-cf-files-1.0.1-r3.ebuild 698
+SHA256 67887a85c45116254d02bde9053af1752b57f8e4c45b91c3e19e00dd6036c766 xorg-cf-files-1.0.1-r3.ebuild 698
+MISC ChangeLog 2990 RMD160 54ea838de9fe02a774f3b5a6c4551ee02db26e74 SHA1 5086d266a2b5415862d480ef89955f79420b70a1 SHA256 99767436804162239a868da4f2efdb835c53da2fd5ceefe6c17862745c77b4f7 size 2990
+MD5 c2b0917c352282b4c96379067c0724a0 ChangeLog 2990
+RMD160 54ea838de9fe02a774f3b5a6c4551ee02db26e74 ChangeLog 2990
+SHA256 99767436804162239a868da4f2efdb835c53da2fd5ceefe6c17862745c77b4f7 ChangeLog 2990
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 143503d48d8c08a07f2598476edf3c7f xorg-cf-files-1.0.1-r2.ebuild 703
-RMD160 cbc54e19dba454aabc48bac4ecc127366ca4e81a xorg-cf-files-1.0.1-r2.ebuild 703
-SHA256 07692808cb6a65401ef9ed0e1156fc9630de4be1221c48154776491ae86ab326 xorg-cf-files-1.0.1-r2.ebuild 703
+MD5 0d4fc2a68d7ea74f956d8996e92eea3b files/digest-xorg-cf-files-1.0.1-r3 262
+RMD160 218a3ecdbe1d274d8d0b1fdd4723cb20409e71ef files/digest-xorg-cf-files-1.0.1-r3 262
+SHA256 c0b19d21123ce3dd3377a66a7f6f4c95e5a028b0da7b8ae4a5850ecca20682d1 files/digest-xorg-cf-files-1.0.1-r3 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEV9nH2iXjgNjfe5sRAnYNAJ9fjGnxs9QBoJNl45d+riCJriQPFACdEHkd
+oYYqQuMPBOehw4Kzhv+cI9I=
+=prJ8
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xorg-cf-files/files/digest-xorg-cf-files-1.0.1-r2 b/x11-misc/xorg-cf-files/files/digest-xorg-cf-files-1.0.1-r2
deleted file mode 100644
index 797be9d20764..000000000000
--- a/x11-misc/xorg-cf-files/files/digest-xorg-cf-files-1.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3107572a02a344b5f5da57a1eb95732 xorg-cf-files-1.0.1.tar.bz2 263753
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.1-r2.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.1-r2.ebuild
deleted file mode 100644
index 3d1e50621211..000000000000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 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.1-r2.ebuild,v 1.1 2006/04/20 03:18:51 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Old Imake-related build files"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_install() {
-	x-modular_src_install
-
-	echo "#define ProjectRoot /usr" > ${D}/usr/$(get_libdir)/X11/config/host.def
-	echo "#define ManDirectoryRoot /usr/share/man" > ${D}/usr/$(get_libdir)/X11/config/host.def
-}