[gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/

["Thomas Sachau" <tommy@gentoo.org>]

commit:     565692127f9431ab385944f75cf9e3260a342db0
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 16:56:08 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=56569212

Add workaround for required ChangeLog

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 532161e..09bcb40 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha91-r1.ebuild 12430 RMD160 c297c6765a203fa341010e468f59ad904be7a463 SHA1 9fa8b94179a5ef543da817d2fed00ee0a8ccff98 SHA256 bf12e7cc2d658b0a12867669bf8c032fe5839aaef369ca75b973b3b1d47f1058
+EBUILD portage-2.2.0_alpha91-r1.ebuild 12532 RMD160 167379a6f913d5bd7af217811020c115e3b36b17 SHA1 871006a4cf908dd2f2def8ffe34546276456facd SHA256 be6eb3ecc8bc155a34abf57d55bb00c7df142423dadafcc71656d9eaa8c1739f
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
index 04b90e2..efdc29e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
@@ -115,6 +115,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	touch ChangeLog #Makefile requires this file to exist
 	if [ -n "${PATCHVER}" ] ; then
 		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
 			rm "$S/bin/ebuild-helpers/portageq" \
@@ -235,6 +236,7 @@ src_install() {
 		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
 		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
 	fi
+	rm "${D}"usr/share/doc/${PF}/ChangeLog || die
 }
 
 pkg_preinst() {