Re-changing to old style patching at least until patch-2.6 is not buggy and masked. Also now install doc in proper directory, bug #295172

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

3 files changed, 17 insertions, 11 deletions

diff --git a/sci-physics/cernlib-montecarlo/ChangeLog b/sci-physics/cernlib-montecarlo/ChangeLog
index a51b05b4f951..04a785104b9f 100644
--- a/sci-physics/cernlib-montecarlo/ChangeLog
+++ b/sci-physics/cernlib-montecarlo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/cernlib-montecarlo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.9 2009/11/26 21:36:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.10 2009/12/04 19:48:26 bicatali Exp $
+
+  04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  cernlib-montecarlo-2006-r2.ebuild:
+  Re-changing to old style patching at least until patch-2.6 is not buggy
+  and masked. Also now install doc in proper directory, bug #295172
 
   26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
   cernlib-montecarlo-2006-r2.ebuild:
diff --git a/sci-physics/cernlib-montecarlo/Manifest b/sci-physics/cernlib-montecarlo/Manifest
index a25dd86f40bb..4bddf728cabc 100644
--- a/sci-physics/cernlib-montecarlo/Manifest
+++ b/sci-physics/cernlib-montecarlo/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX cernlib-montecarlo-2006-noherwig.pach 1993 RMD160 00bbaa63f49daf9311e6c33bc3711f3f0f8806a6 SHA1 a0faaa0244e2e9f8917e3639098a610777a10fb8 SHA256 bb85c46eb9d2acaf95dad615aac3b3c08b2607aea3368f7bbadd2532d58e177d
 DIST mclibs_2006.dfsg.2-5.diff.gz 38713 RMD160 24a7186fcc39174871044c782830ad42c11c1873 SHA1 2aba8e42db0fc317e559092b9d51b16520ac7678 SHA256 3c0d73211ad0cbb6c8b8c2d329a93ffcd853475e3027f5bb82120c112e0d0123
 DIST mclibs_2006.dfsg.2.orig.tar.gz 7406559 RMD160 116bc443dafc299d66d0e83080c1b3b5b34d41b9 SHA1 4c86439750f0b0824bf2f58cf9f2dab810be5293 SHA256 8e73ccb987cb8f930ed44eac807d4f8fd5b03d6926b2f8d62ffb6b31806acf73
-EBUILD cernlib-montecarlo-2006-r2.ebuild 1955 RMD160 0396dc07a039a37c54859fdb100f4d1ae956d2e0 SHA1 956a46bfdbe5a685cec9dfe2c0819ee31e9fef1a SHA256 7997e56f920d7577c03574368e26de0febdf5ff92267133ed9c0ba5b43d33bd9
-MISC ChangeLog 1819 RMD160 72f0d4cf391e5d2e41a4587194334d7717c35262 SHA1 e431db3856af236d49178f23eed142d337634e32 SHA256 09970ca42a8c4221fae3ae1cb7e371e1baf917e0dce9ff382cbc8eb2e47da263
+EBUILD cernlib-montecarlo-2006-r2.ebuild 1969 RMD160 05bb02b9e2879ba08c738dcdff226c8726fdd5c5 SHA1 6f74aa7ffbae410c235acb0dd0141ca469242df0 SHA256 e744861616b2e505f77a215922702b5bf2ffa1b11208c4ed0d4d24455c03f1d0
+MISC ChangeLog 2055 RMD160 50717da554d63e2d11ab687dc4cb49a6833680f3 SHA1 e73e7f39299c61adedeae40c236b840ece63d403 SHA256 12c7fbf3283e28faa204071228e1b888a548e353b498d9e0c65fe0249f76e363
 MISC metadata.xml 665 RMD160 af9455141b04bef1ca123e0972dfe42394ed4114 SHA1 8fa6aaafe86b3e4d9cae2f1251d8a94a44872ec4 SHA256 c5e63a2fc2c3e38285e31547e814cfab76b8aac8da77114a9a0d7ad16ef38dc5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksO/lkACgkQ1ycZbhPLE2CvigCgk9VtmbQoPET+HtAx8RQ6lZvH
-YXMAnj8in7CljWEVOtu1YhoXdiy+iSnd
-=0Mgq
+iEYEARECAAYFAksZcPAACgkQ1ycZbhPLE2DfywCgjW0ZyzO1CXbArjVwiPFCRWEJ
+Q0AAn17JH2b47P4/CXiKNoq7sFS625Zl
+=84VQ
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
index c92e76f2d49f..043768ed1327 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+B1;1704;0c# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild,v 1.3 2009/11/26 21:36:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild,v 1.4 2009/12/04 19:48:26 bicatali Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -30,13 +30,12 @@ DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend"
 
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
 src_prepare() {
 	cd "${WORKDIR}"
 	sed -i -e 's:/tmp/dp.*/cern:cern:g' ${DEB_P}-${DEB_PR}.diff || die
 	epatch ${DEB_P}-${DEB_PR}.diff
-	mv ${DEB_PN}-${DEB_PV}{.orig,}/upstream
 	cd "${S}"
 	cp debian/add-ons/Makefile .
 	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
@@ -64,7 +63,9 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" \
+		MCDOC="${D}usr/share/doc/${PF}" \
+		install || die "emake install failed"
 	cd "${S}"/debian
 	dodoc changelog README.* deadpool.txt copyright || die "dodoc failed"
 	newdoc add-ons/README README.add-ons || die "newdoc failed"