Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-physics/cernlib-montecarlo/files: cernlib-montecarlo-2006-noherwig.patch cernlib-montecarlo-2006-noherwig.pach
Date: Tue, 24 Aug 2010 20:19:09
Message-Id: 20100824201904.AC1BA20051@flycatcher.gentoo.org
1 bicatali 10/08/24 20:19:04
2
3 Added: cernlib-montecarlo-2006-noherwig.patch
4 Removed: cernlib-montecarlo-2006-noherwig.pach
5 Log:
6 Fixed syntax error in patch name, closing bug #333397, thanks RStefano Takekawa
7
8 (Portage version: 2.2_rc68/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 sci-physics/cernlib-montecarlo/files/cernlib-montecarlo-2006-noherwig.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/files/cernlib-montecarlo-2006-noherwig.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/files/cernlib-montecarlo-2006-noherwig.patch?rev=1.1&content-type=text/plain
15
16 Index: cernlib-montecarlo-2006-noherwig.patch
17 ===================================================================
18 diff --git a/mclibs-2006.dfsg.2.orig/Makefile b/mclibs-2006.dfsg.2.orig/Makefile
19 index f3c89fd..780499e 100644
20 --- a/mclibs-2006.dfsg.2.orig/Makefile
21 +++ b/mclibs-2006.dfsg.2.orig/Makefile
22 @@ -89,9 +89,6 @@ install-includes:
23 done ; \
24 done
25
26 - # install some symlinks, e.g. herwig$$version -> herwig
27 - rm -f $(DESTDIR)$(includedir)/herwig && \
28 - ln -sf herwig59 $(DESTDIR)$(includedir)/herwig
29 rm -rf $(DESTDIR)$(includedir)/isajet758
30 mv $(DESTDIR)$(includedir)/isajet $(DESTDIR)$(includedir)/isajet758
31 ln -sf isajet758 $(DESTDIR)$(includedir)/isajet
32 @@ -128,14 +125,12 @@ install-arch: install-includes
33 fi
34
35 # ... and mclibs documentation
36 - for dir in cojets eurodec herwig isajet pdflib ; do \
37 + for dir in cojets eurodec isajet pdflib ; do \
38 install -d -m 0755 $(MCDOC)/$$dir ; \
39 done
40 install -p -m 0644 $(CERN_DOCDIR)/cojets.txt $(MCDOC)/cojets/
41 install -p -m 0644 $(CERN_DOCDIR)/isa* $(MCDOC)/isajet/
42 install -p -m 0644 $(CERN_DOCDIR)/eurodec.txt $(MCDOC)/eurodec/
43 - install -p -m 0644 $(CVSCOSRC)/mclibs/herwig/doc/herwig59 \
44 - $(MCDOC)/herwig/herwig59.txt
45 install -p -m 0644 $(CVSCOSRC)/mclibs/pdf/dpdf/pdfdoc.doc \
46 $(MCDOC)/pdflib/pdfdoc.txt
47
48 diff --git a/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile b/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile
49 index 0c9867d..0f04f1b 100644
50 --- a/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile
51 +++ b/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile
52 @@ -6,7 +6,7 @@
53 to them and their dependents. They have already been purged from
54 Debianized source code. Also, re-order libs so that dependent ones
55 come after dependees. */
56 -LIBDIRS= cojets eurodec pdf photos herwig isajet
57 +LIBDIRS= cojets eurodec pdf photos isajet
58
59 SUBDIRS = $(LIBDIRS)
60
61 @@ -16,7 +16,7 @@ InstallLibSubdirs($(LIBDIRS))
62 InstallSharedLibSubdirs($(LIBDIRS))
63
64 /* Again, purge Pythia, Jetset and dependents. */
65 -INCLUDEDIRS= cojets eurodec herwig isajet pdf
66 +INCLUDEDIRS= cojets eurodec isajet pdf
67
68 InstallIncludeSubdirs($(INCLUDEDIRS))