Respect EPREFIX when generating README.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 30 insertions, 22 deletions

diff --git a/dev-vcs/git-merge-changelog/ChangeLog b/dev-vcs/git-merge-changelog/ChangeLog
index 933884b254c2..55543be90239 100644
--- a/dev-vcs/git-merge-changelog/ChangeLog
+++ b/dev-vcs/git-merge-changelog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git-merge-changelog
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-merge-changelog/ChangeLog,v 1.2 2014/03/18 21:47:34 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-merge-changelog/ChangeLog,v 1.3 2015/05/28 13:47:34 vapier Exp $
+
+  28 May 2015; Mike Frysinger <vapier@gentoo.org>
+  git-merge-changelog-20140223.ebuild:
+  Respect EPREFIX when generating README.
 
 *git-merge-changelog-20140223 (18 Mar 2014)
 
@@ -13,4 +17,3 @@
   04 Jan 2014; Ulrich Müller <ulm@gentoo.org>
   +git-merge-changelog-20140103.ebuild, +metadata.xml:
   Initial import. Ebuild contributed by me.
-
diff --git a/dev-vcs/git-merge-changelog/Manifest b/dev-vcs/git-merge-changelog/Manifest
index 609ef440fa2f..49b9ad475ae8 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -4,20 +4,23 @@ Hash: SHA256
 DIST git-merge-changelog-20140103.tar.xz 299628 SHA256 d3f0694ca65c765a39b5d2381a2c9d735d16d29bef1737fdf38e9d44bcd3ef29 SHA512 cc3287424313f3c3590bbc67ac2615c69154001019915163b59d4600b320abeaf1e72baac7fd53dd2906be16149ce9a325db0b8966bb024db18f4d11b86fd405 WHIRLPOOL 1689456ebc076bbc3e97beb6f63f91bf857a5493ce29b2fd3dea5667891cd6db01f5b30dbdbea510701c153949f1f0287e966af419846be1df06f493523d8fe5
 DIST git-merge-changelog-20140223.tar.xz 298332 SHA256 75a584cee054cafcb1ab7b71dc3beee33b39ea30b50dace48f044ee788560482 SHA512 ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638 WHIRLPOOL 41182891e268e0ade060cac261d230fda2534fa53aebb40ea2b44e62cef1d5bef69ba9d7a7f6839c4b24135b1012d29f43886b9729fdd801173c2a8c240b3809
 EBUILD git-merge-changelog-20140103.ebuild 815 SHA256 a6fce52e46d191c6457afa38ba2ad2a795fd51b3d5fbe231ace3926cbd310756 SHA512 c58835ccc5b37378233f2c7f8f99fdc4ab2f585bc3ec8b988773072dbe854863d7e8b8f6a8486a8d04e79cbf2e11451559a66831c7b0fd95f4d1a1b3adfbb4b1 WHIRLPOOL 4c39239c66e704babbccb046342cd6107258d4c0e0bc623a651f12410c31cd723bbf0043dd2bb1eca34de4755563fe950e74016f3da750ea2a67269531ad313f
-EBUILD git-merge-changelog-20140223.ebuild 815 SHA256 9740a61f97732b897d7488a878de6a21fc26af77563ba2542f440f388bbef539 SHA512 e0ad6809946aa02b2033f287ce2270c0b363f0bc6d4e7e383d354b3aacc0f2fa3294245a586eae3d8e14302e65dfc98ff0ea476659acfa69349e941f195c3edf WHIRLPOOL ad440b9ec10abb9a3e6a6f3e6ef1665f5fafd5c43edc0d9bddcad2d88fed8ea11d77d0eb091173cdaca022a910f907103025e4ee13d7157a445f5329a5ba47c6
-MISC ChangeLog 565 SHA256 e5cd006c1690e6956bca07f41ade30fb8ae789fdf801224a1900f9c05dadaa57 SHA512 e06868b7cbb956415dcf5ab669aff982883f481d1742e63d3bf01d3f0b48215aceebce910d3ab184af77cc649d9044dba6daba6c3a0bcf6baf81473b50801726 WHIRLPOOL c9da9fe3821ac0d6450fe1ae8b74a838b6fc072c6f34a9cc05815e93ad264f5fcfed1ef55005d43d9f5124119529faab5e64b5c784115d3e0dbf09592202e70c
+EBUILD git-merge-changelog-20140223.ebuild 837 SHA256 741386ab7fccd56d31bc59308b818fd9b65c46c08a56b42b086b7290951ce692 SHA512 2807e9be8d40a4e26aa03d1d69b9c96b7fe2f0a1f9075afd8bfd681bc304881053eddd5dc79f4c7de005440be5917ba3a8fbbe40eb9266e6572cfff9e9fbfe2b WHIRLPOOL 75a760ee54bd8b94ed27f1266cd4f86202b93ade54b1dddc6923d311e39a324c5e9983a4ece9fc626ae9d7fb890d864fa56af44cabe49118efba48a3e74cd41a
+MISC ChangeLog 699 SHA256 abfc9bd91423fb2ab63b5a66695b97d7145e427cd79a7310b0bec2975982d873 SHA512 6c3bf3699f98280768104baeec4aafacceafd0f64f97fe73b9f238d99444989db59604a42ba9eb5958420523d625702684b77700ac1504a97db87fb4852d8e12 WHIRLPOOL 3a173532297ea7bf9d10c243b0523b6fd2c7807ebff8db48db97193f47badf3b69ad809c14970b4e045aaebccc96aca102a5da81ee1e3683ba016a69829fdae9
 MISC metadata.xml 198 SHA256 6998c57a835c2c7b81d26f91ae232a8df3128b85ad0348e1fa9444f157c28481 SHA512 5607a8c66738198e21639247c46f41240819c2e0894855a05543e88edd7bac8ef5c5e2f3ca762f9c9bcf85f033235f013d8b40406acda50c1857c4ad51945c40 WHIRLPOOL 60b0c8b7be2ee31dc62d3668b6347266085a756f3f565cb3a962a91877afc1f6beaff21a36b7a2d4de1a4eb5798a9baa1533e2a9495b1552517036d733308873
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTKMCFAAoJEJQzkH1pP7W4xEAL/0+Scrcrq2KDtBc8oVGf8IpY
-fmAu23d8IlwMHqsgTDxxEm7KhEzqlLQMtriAB+dnJEPSr1RSueUlmjmvMXFGCOYp
-IaHi95+JUVU5lD7tfmsIHsTsGinp7wJ0m0+Q5ioN5u2Xs6pCAQHVXpb6sNdSNw3C
-qRJG7UkuHvDKk+6JEHhLGwVndoZXJZQXAXvIA7rOQ1XFXBFpwYIp2lAoug6q1hbk
-XhiAsVkMOHrlSPPz9lh61hlhK9VYip/jzga/EBE40DBGVjq7iA+ER9gPwOaDQ4Sh
-epYByCZA7HvNt+y7TLHgIi0f+ts8eX3Py4ahyKj/CihWb6uxCHOFo3pojqkLWmro
-tOJsYiH73CfKKPSyR4eR2gxlBMv2GpWdXaUBgH/im4cBNp97b0XAjeBdP7HrBodu
-wVLZT6TvMFDglyhn65GL7ZFNQBZQQY7fVisK2+tIf6gt4YJlVSsiyRraIaSEn+G+
-K3IrRuHhHm0YK4qUWbuxsH74KhcOXAVWiQ8vebI2Og==
-=7iUH
+iQIcBAEBCAAGBQJVZxx3AAoJEPGu1DbS6WIAb24QAIhxJp6BKYXgBIFA297TplZA
+2zgHK01XPK0lJ6FaL1xlvvUvag36xLCkMqyMVAOqYhdl54n4Coz3c45fUiTA5Y0H
+O3sOPlJnmaJ31LbgSW9an4s/GcH2OrA4zegUqfIdVXeEMZ2WvLNkrMGI7z9255KA
+GLKePubGqhZweDRt8xcQnjJ2DK5FLGAKcdnoiI52GlNIdeptB9AfAEe9EtzynAk4
+DtDxGhJG21uV2Qp8OnwtggLkbTM8QGzed7240TOTmJF7vTTrEKio0YamEgrbSaNj
+ykqQ3MBmj9Da6yVEuw/wQbyNF2dHdsrdCyH2y2l3XzP14u2I8eOY/InQmRnLHrQO
+esCinHN6COgsWrYtQrwMfToiHxwXc5vjlKbYLc8azwgSAeRYmG5rzBYNzlfFljU7
+6gY/GMhTa1V1GZoNiEoXFvdRcQZOBwUrC7eXQKRV5mH891evhOy+89PqaF6Ds7pC
+ABm5gzh37k6KYxwwkqBfqDVVxwBuMkvwpvhe5YHxtCYHkd+WRmnt0w7huSCSqBN0
+69GlgGEbedmqqVY+7g76AaqEn9gakmfiGHi9RVVaNVDt/wP0R+ASN5qFjx4X3z1q
+1t2ALBLStEd0/VgHPS9lNj5f77AFrdYZY1t4IRugkVBiMmEXwkXT+am5tZjHouza
+SZrWCRIvf0t2ZODT1ZnI
+=qcws
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
index 257f25155f5c..bb3ddfcec040 100644
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild,v 1.1 2014/03/18 21:47:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild,v 1.2 2015/05/28 13:47:34 vapier Exp $
+
+# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
+# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
+# cd ${PN}; ./configure; make maintainer-clean
 
 EAPI=5
 
 DESCRIPTION="Git merge driver for GNU style ChangeLog files"
 HOMEPAGE="http://www.gnu.org/software/gnulib/"
-# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
-# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
-# cd ${PN}; ./configure; make maintainer-clean
 SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	sed -n '/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;s:/usr/local:/usr:g;p;q}' \
+	sed -n "/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;s:/usr/local:${EPREFIX}/usr:g;p;q}" \
 		gllib/git-merge-changelog.c >README || die
 }