diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-17 10:35:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-17 10:35:54 +0000 |
commit | 463397cf1e064185110fe57c568d73f99a06f5d1 (patch) | |
tree | 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /sci-physics/pythia | |
parent | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff) |
gentoo resync : 17.02.2021
Diffstat (limited to 'sci-physics/pythia')
-rw-r--r-- | sci-physics/pythia/Manifest | 8 | ||||
-rw-r--r-- | sci-physics/pythia/files/pythia-6.4.28-fno-common.patch | 54 | ||||
-rw-r--r-- | sci-physics/pythia/files/pythia8209-run-tests.patch | 20 | ||||
-rw-r--r-- | sci-physics/pythia/pythia-6.4.28-r2.ebuild (renamed from sci-physics/pythia/pythia-6.4.28-r1.ebuild) | 33 | ||||
-rw-r--r-- | sci-physics/pythia/pythia-8.1.86-r1.ebuild | 100 | ||||
-rw-r--r-- | sci-physics/pythia/pythia-8.2.26-r1.ebuild (renamed from sci-physics/pythia/pythia-8.2.26.ebuild) | 57 |
6 files changed, 107 insertions, 165 deletions
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest index 9a0a3a47ac45..3e5d58a46c3b 100644 --- a/sci-physics/pythia/Manifest +++ b/sci-physics/pythia/Manifest @@ -1,6 +1,6 @@ +AUX pythia-6.4.28-fno-common.patch 1899 BLAKE2B b05c2f147ec34fa334b830c1105d682dd45ba80f824ed706de12cf2bf5767808a1ac698f57d6a9ea78e6cbcb39ab4fc25a8d5c1e3f7ccc50ac54d81bb1faa678 SHA512 41005cfdc1766541c1336c1d0c2e1acb606496feb4fbd75fc3ef38d5ccb2010d095c927e615d6e33b7533dbe02a876608a7d789e58bcc03de59b233efcbfe814 AUX pythia-8.2.26-run-tests.patch 1044 BLAKE2B e97cf79874004b0ec99ef19b2b4af39ae96a1f115206d1ddb912bacc895d144162f62156cf92bc876d27a976a1465a6509393b0b50230f1990fe95b8d068d2ed SHA512 37297dbf852b402adc03f9a60ca2f9108d192dc005de1c6dfd9a9725220a50da322267938a91cfe082301942059a9b4caf91a85e41179becee6e9889881c9b57 AUX pythia8209-root-noninteractive.patch 500 BLAKE2B 7af9e7375cac38d87ae8935e712ac9b2a5109984a4c7111c59033adf46f0d133b94eb8dccb663683302ff0529e56b819c9f667e2d1253e4b4f1c585dcd1a4eff SHA512 9dad44ee084b5edea6560ba639e562c6ddc56cd7170ec21628176aeaec11d535de2813599b9c45b49511ad3d0ad9cb0540d9052179c9e9907d10d81ea55bdea2 -AUX pythia8209-run-tests.patch 962 BLAKE2B e3b2f20fca58e7c51eaea9c11a76dd1320bfb555adfbe4254ad0bc2f81c4aee1bb451366c092ccfe70eda758e3106274cadceea9c907dad45e453c3afccfdafa SHA512 e0629ca9016fc77cef78d81ed84d4a54171d7497488e8c1a2b60adef0e32f18a96353e55d9d08789ebc144dee209844f8f7cb8215347c7ed943725fff21921b0 DIST CT10.tar.gz 10246366 BLAKE2B f0daf0a3ca6cd2f178f993944cdc29de5deb1f441d197e47c8b1c285a56abc0fdb1cd53ec5a8e7736e200397bea9ec9cf4d04420ce206e5c396b85b63f695d00 SHA512 90406bd102ab54b683fa3e6f3fc759febea2454a0b96c6a8d373cdec297f5d652097057a015c7d87241792ed9b5d9ac658a33155cdd7362f59110f8f06ecce73 DIST MRST2004qed.tar.gz 185079 BLAKE2B 62e0371de965698100755b14b0c282095b84b40800a58cd6776c458b03982f032f3b2464eb76174084dd22de9fd962e202a4896327b0a00579c3a632dac24ccc SHA512 404aacf0e241f572cc42ad4cf963deef1acd3d365fa68cfa3518878f921858046377ea39caf663fdced2cdde07af2f6ce695737f7fea229489df3d3f38283c95 DIST MRST2007lomod.tar.gz 56685 BLAKE2B 8515b6f77302621f4b37f550840f07f0351e7ea98de16a37ceb4cb0f2ea64aa4b027462ffc442f34d1f4c349d67fac7b35353606d8920f17621c7187e508c689 SHA512 8e55627a01c85d90a62e4fb11b115c2faac2220479b6d558d3d6f1b801fc5c3e88abc377cd5437ccaeedd34b2ca42d6e833014566b796e5e1eebcf4d620e5dc0 @@ -13,10 +13,8 @@ DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B ec655014d3904b66da4a1e748a37c3 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3 DIST pythia6.tar.gz 567451 BLAKE2B c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1 -DIST pythia8186.tgz 8921248 BLAKE2B 9e753a04c2dbc5362a24b06d40c238e5fcc5ac700dd20b9bc47b1a68604fdb87808018593c28a1d6dcb06a212bdec1146431f1096db70f4c934413a0c3b20fa0 SHA512 84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0 -EBUILD pythia-6.4.28-r1.ebuild 1908 BLAKE2B cc2ddb262eea5a646d38c983e22f3ff46f60621b73aa9c469a7afb67455ec3935d89826d3633d2401ada405ae9df09e823f263c57d1ccad5829eb492af71f17c SHA512 dcbf3226adf25fb2c738f0825cd70aef70d3c1d77d123bb765db2f9666b7fe23e06f469ed2ee285dd1a315731ddc7a90d798e53b88723b72586a0dfe11ad7863 +EBUILD pythia-6.4.28-r2.ebuild 2020 BLAKE2B b97090e1474f9a260aa9d5ce0502e8640f9ea723bdceb31feb153dc50e74e7f27267e17e7fd396768f8abe9a2b5ad8243599c5acddb0a08f93fb882bba6d5139 SHA512 c856e72b4a243f88dbc2cdffc87d03e5675bbc871a4b67988bb2f33e5d9b39412e5c862fec6a431bbea93ab8d39e68cb878c29a93090f6b5eb9d6ca1f6d16df7 EBUILD pythia-6.4.28.ebuild 1864 BLAKE2B c89b5effbe414331507c920841617698affb57152a721be748a336cdd26e1cb492d273e9f43e60e485d4ad7407fbda88c2578b72f2c56789026c7e0bccf76999 SHA512 9e3fa32d791672b3aec15f779700fd33a6a83488ca315e365e3fdc7eb88ee3a8405dffcc6eda705d3334c79e8a726c1130ba97b2baf0d91004c881b1e922a2af -EBUILD pythia-8.1.86-r1.ebuild 2618 BLAKE2B 28b0db0d7168c731eb627deebe5542426bb3969f76a8135ebd4dc02d5e710f68ff268c65b3c9fd7ea78246bc5d428041e22984959b9f62921dc2fc1a0a479f7b SHA512 0b07f2d9d85cc46a04cd79d9363bb044f80494c20ace27411d9593d4847932c79453129a158fc20ddf616f63a0965be165c1e68c61994919f0fb17e13a14af1c -EBUILD pythia-8.2.26.ebuild 5847 BLAKE2B 7c62a7b2d2f1623af2b30350a84af3843430c0b25af45b46d1c2d5beb79c93d05f1d06042ddcd151ce5bd9c2ef015fd49bc6ae6df2c938fa9fed0df63748a4bf SHA512 727d1f977d5425544512b2c9fa76a3c5229641f2c01e45ab27f1e8262ab7585421ac29b10ffe77225a5fe27092595de2c2c759e4bde2325d6be1eaefc983087c +EBUILD pythia-8.2.26-r1.ebuild 5732 BLAKE2B e93959f6db754f19d410abf4b4c4b25723857a768106cea744374d7195a6fcad6534f683414fbbe3c1512732e4a1353a1f5f136d672aa9e98d1fa6e29ddd0644 SHA512 ff3805db1893b4204f2d6de709b48bb6105ef23c535ecd7c53018a754b56d2f1a319b6ffec7cfca1ba3c10752a6deeb84272f50d00a62e3cd4a85a69f784b571 MISC metadata.xml 1298 BLAKE2B 3a8448cffc50ab81baf30e783a7d30387f4cd61be3f1a35ccdc9277dbb33d7178bbe9e103d189dd78a6775fcfa563480363448308a583ab2d9b513eb6e6f2b46 SHA512 b991381193c62d05d01ea82c74a2fabe3968683b4a1e0914027768dbbc3d2b52a85584b77b1b7274e77222e10da0aaa1a55d3982b423bc7c2b5deb4d775e6389 diff --git a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch new file mode 100644 index 000000000000..3ee9bc7c0f7a --- /dev/null +++ b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/766306 +--- a/pythia6_common_address.c ++++ b/pythia6_common_address.c +@@ -48,28 +48,28 @@ + # define pybins PYBINS + #endif + +-int pyjets[2+5*4000+2*2*5*4000]; +-int pydat1[200+2*200+200+2*200]; +-int pydat2[4*500+2*4*500+2*2000+2*4*4]; +-int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */ +-char pydat4[2*500*16]; +-int pydatr[6+2*100]; +-int pysubs[2+500+81*2+2*200]; +-int pypars[200+2*200+200+2*200]; +-int pyint1[400+2*400]; +-int pyint2[500+2*500+2*20*500+2*4*40]; +-int pyint3[2*81*2+3*1000+2*1000]; +-int pyint4[500+2*5*500]; +-int pyint5[1+3*501+2*3*501]; +-char pyint6[501*28]; +-int pyint7[2*6*7*7]; +-int pyint8[2*5*13]; +-int pyint9[2*4*13]; +-int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */ +-int pymssm[100+2*100]; +-int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2]; +-int pyints[2*20]; +-int pybins[4+1000+2*20000]; ++extern int pyjets[2+5*4000+2*2*5*4000]; ++extern int pydat1[200+2*200+200+2*200]; ++extern int pydat2[4*500+2*4*500+2*2000+2*4*4]; ++extern int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */ ++extern char pydat4[2*500*16]; ++extern int pydatr[6+2*100]; ++extern int pysubs[2+500+81*2+2*200]; ++extern int pypars[200+2*200+200+2*200]; ++extern int pyint1[400+2*400]; ++extern int pyint2[500+2*500+2*20*500+2*4*40]; ++extern int pyint3[2*81*2+3*1000+2*1000]; ++extern int pyint4[500+2*5*500]; ++extern int pyint5[1+3*501+2*3*501]; ++extern char pyint6[501*28]; ++extern int pyint7[2*6*7*7]; ++extern int pyint8[2*5*13]; ++extern int pyint9[2*4*13]; ++extern int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */ ++extern int pymssm[100+2*100]; ++extern int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2]; ++extern int pyints[2*20]; ++extern int pybins[4+1000+2*20000]; + + void *pythia6_common_address(const char* name) { + if (!strcmp(name,"PYJETS")) return pyjets; diff --git a/sci-physics/pythia/files/pythia8209-run-tests.patch b/sci-physics/pythia/files/pythia8209-run-tests.patch deleted file mode 100644 index d1edc8393726..000000000000 --- a/sci-physics/pythia/files/pythia8209-run-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pythia8209/examples/Makefile.orig 2015-06-04 22:21:53.000000000 +0300 -+++ pythia8209/examples/Makefile 2015-06-05 05:35:25.324262331 +0300 -@@ -139,3 +139,17 @@ - rm -f test[0-9][0-9][0-9]; rm -f out[0-9][0-9][0-9];\ - rm -f weakbosons.lhe; rm -f Pythia8.promc; rm -f hist.root;\ - rm -f *~; rm -f \#*; rm -f core*; rm -f *Dct.* -+ rm -f main*out *.dat -+ -+# Run tests, inject test-specific arguments when needed -+main%.out: main% -+ ./$< \ -+ $(if $(findstring $*,16 42 43 $(shell seq 81 89)), main$*.cmnd) \ -+ $(if $(findstring $*, $(shell seq 81 83)), w+_production_lhc_0.lhe) \ -+ $(if $(findstring $*, 84), hepmcout84.dat 2 w+_production_lhc) \ -+ $(if $(findstring $*, $(shell seq 85 88)), w_production) \ -+ $(if $(findstring $*, 42 43 $(shell seq 81 89)), histout$*.dat) \ -+ > $@ -+ -+main89.out: main89 -+ $(foreach cmd, $(wildcard main89*.cmnd), ./$< $(cmd) histout-$(cmd).dat >> $@ || exit;) diff --git a/sci-physics/pythia/pythia-6.4.28-r1.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild index 92d4af7849ac..86fbe7d4358e 100644 --- a/sci-physics/pythia/pythia-6.4.28-r1.ebuild +++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools fortran-2 versionator +inherit autotools fortran-2 -MV=$(get_major_version) +MV=$(ver_cut 1) MY_PN=${PN}${MV} DOC_PV=0613 EX_PV=6.4.18 @@ -27,12 +27,16 @@ SRC_URI=" SLOT="6" LICENSE="public-domain" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples static-libs" +IUSE="doc examples" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { cp ../pythia6/tpythia6_called_from_cc.F . cp ../pythia6/pythia6_common_address.c . - cat > configure.ac <<-EOF + default + + cat > configure.ac <<-EOF || die AC_INIT(${PN},${PV}) AM_INIT_AUTOMAKE AC_PROG_F77 @@ -41,20 +45,21 @@ src_prepare() { AC_CONFIG_FILES(Makefile) AC_OUTPUT EOF - echo >> Makefile.am "lib_LTLIBRARIES = libpythia6.la" - echo >> Makefile.am "libpythia6_la_SOURCES = \ " + echo >> Makefile.am "lib_LTLIBRARIES = libpythia6.la" || die + echo >> Makefile.am "libpythia6_la_SOURCES = \ " || die # replace wildcard from makefile to ls in shell local f for f in py*.f struct*.f up*.f fh*.f; do - echo >> Makefile.am " ${f} \\" + echo >> Makefile.am " ${f} \\" || die done - echo >> Makefile.am " ssmssm.f sugra.f visaje.f pdfset.f \\" - echo >> Makefile.am " tpythia6_called_from_cc.F pythia6_common_address.c" + echo >> Makefile.am " ssmssm.f sugra.f visaje.f pdfset.f \\" || die + echo >> Makefile.am " tpythia6_called_from_cc.F pythia6_common_address.c" || die + eautoreconf } src_configure() { - econf $(use_enable static-libs static) + econf --disable-static } src_install() { @@ -62,7 +67,9 @@ src_install() { dodoc update_notes.txt use doc && dodoc "${DISTDIR}"/lutp${DOC_PV}man2.pdf if use examples; then - insinto /usr/share/doc/${PF} - doins -r "${WORKDIR}"/examples + dodoc -r "${WORKDIR}"/examples + docompress -x /usr/share/doc/${PF}/examples fi + + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-physics/pythia/pythia-8.1.86-r1.ebuild b/sci-physics/pythia/pythia-8.1.86-r1.ebuild deleted file mode 100644 index 60aca11c2471..000000000000 --- a/sci-physics/pythia/pythia-8.1.86-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator toolchain-funcs multilib - -MV=$(get_major_version) -MY_P=${PN}$(replace_all_version_separators "" ${PV}) - -DESCRIPTION="Lund Monte Carlo high-energy physics event generator" -HOMEPAGE="http://pythia8.hepforge.org/" -SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz" - -SLOT="8" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples gzip +hepmc static-libs" - -DEPEND=" - gzip? ( dev-libs/boost sys-libs/zlib ) - hepmc? ( sci-physics/hepmc:0= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - PYTHIADIR="${EPREFIX}/usr/share/pythia8" - # set datadir for xmldor in include file - sed -i \ - -e "s:../xmldoc:${PYTHIADIR}/xmldoc:" \ - include/Pythia8/Pythia.h || die - # respect libdir, prefix, flags - sed -i \ - -e "s:/lib:/$(get_libdir):g" \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -e "s:-O2::g" \ - configure || die - sed -i \ - -e "s:LIBDIR=.*:LIBDIR=$(get_libdir):" \ - -e "s:LIBDIRARCH=.*:LIBDIRARCH=$(get_libdir):" \ - -e "s:cp -r lib:cp -r $(get_libdir):" \ - -e '/ln -fs/d' \ - Makefile examples/Makefile || die -} - -src_configure() { - export USRCXXFLAGS="${CXXFLAGS}" - export USRLDFLAGSSHARED="${LDFLAGS}" - tc-export CC CXX - # homemade configure script - ./configure \ - --installdir="${EPREFIX}/usr" \ - --datadir="${PYTHIADIR}" \ - --enable-shared \ - $(usex gzip "--enable-gzip=yes" "") \ - $(usex hepmc "--with-hepmcversion=2 --with-hepmc=${EPREFIX}/usr" "") \ - || die - if ! use static-libs; then - sed -i \ - -e '/targets.*=$(LIBDIR.*\.a$/d' \ - -e 's/+=\(.*libpythia8\.\)/=\1/' \ - Makefile || die - sed -i \ - -e 's:\.a:\.so:g' \ - -e 's:$(LIBDIRARCH):$(LIBDIR):g' \ - examples/Makefile || die - fi -} - -src_test() { - cd examples || die - # use emake for parallel instead of long runmains - local tests="$(echo main0{1..8})" t - use hepmc && tests="${tests} main31" - emake ${tests} - for t in ${tests}; do - LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \ - bin/${t}.exe > ${t}.out || die "test ${t} failed" - done - emake clean && rm main*out -} - -src_install() { - emake INSTALLDIR="${ED}/usr" DATADIR="${D}/${PYTHIADIR}" install - rm -r "${D}"/${PYTHIADIR}/{html,php}doc || die - echo "PYTHIA8DATA=${PYTHIADIR}/xmldoc" >> 99pythia8 - doenvd 99pythia8 - - dodoc GUIDELINES AUTHORS README - if use doc; then - dodoc worksheet.pdf htmldoc/pythia8100.pdf - dohtml -r htmldoc/* - fi - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples rootexamples - docompress -x /usr/share/doc/${PF}/{root,}examples - fi -} diff --git a/sci-physics/pythia/pythia-8.2.26.ebuild b/sci-physics/pythia/pythia-8.2.26-r1.ebuild index 5adb37c9e6d5..3c735682cf15 100644 --- a/sci-physics/pythia/pythia-8.2.26.ebuild +++ b/sci-physics/pythia/pythia-8.2.26-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils multilib toolchain-funcs versionator +inherit toolchain-funcs -MV=$(get_major_version) -MY_P=${PN}$(replace_all_version_separators "" ${PV}) +MV=$(ver_cut 1) +MY_P="${PN}${PV//./}" LHA_VER="6.1" DESCRIPTION="Lund Monte Carlo high-energy physics event generator" @@ -25,19 +25,24 @@ SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz SLOT="8" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples gzip +hepmc fastjet lhapdf root static-libs test" +IUSE="doc examples fastjet gzip +hepmc lhapdf root test" RESTRICT="!test? ( test )" RDEPEND=" - fastjet? ( >=sci-physics/fastjet-3 ) + fastjet? ( sci-physics/fastjet ) gzip? ( sys-libs/zlib ) hepmc? ( sci-physics/hepmc:0= ) - lhapdf? ( >=sci-physics/lhapdf-6:= ) -" + lhapdf? ( sci-physics/lhapdf:= )" # ROOT is used only when building related tests DEPEND="${RDEPEND} - test? ( root? ( sci-physics/root:= ) ) -" + test? ( + root? ( sci-physics/root:= ) + )" + +PATCHES=( + "${FILESDIR}"/${P}-run-tests.patch + "${FILESDIR}"/${PN}8209-root-noninteractive.patch +) S="${WORKDIR}/${MY_P}" @@ -51,6 +56,8 @@ pkg_pretend() { src_prepare() { PYTHIADIR="/usr/share/pythia8" EPYTHIADIR="${EPREFIX}${PYTHIADIR}" + + default # set datadir for xmldor in include file sed -i \ -e "s:../share/Pythia8/xmldoc:${EPYTHIADIR}/xmldoc:" \ @@ -84,18 +91,13 @@ src_prepare() { examples/main54.cc || die # ask cflags from root sed -i "s:root-config:root-config --cflags:g" examples/Makefile || die - if ! use static-libs; then - sed -i \ - -e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \ - -e 's:libpythia8\.a$:libpythia8$(LIB_SUFFIX):g' \ - Makefile || die - sed -i 's:libpythia8\.a:libpythia8$(LIB_SUFFIX):g' \ - examples/Makefile || die - fi - eapply "${FILESDIR}/${PF}-run-tests.patch" - eapply "${FILESDIR}/${PN}8209-root-noninteractive.patch" - eapply_user + sed -i \ + -e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \ + -e 's:libpythia8\.a$:libpythia8$(LIB_SUFFIX):g' \ + Makefile || die + sed -i 's:libpythia8\.a:libpythia8$(LIB_SUFFIX):g' \ + examples/Makefile || die } # TODO: the following optional packages are out of Gentoo tree: @@ -157,17 +159,18 @@ src_install() { # make install is too broken, much easier to install manually dobin bin/pythia8-config doheader -r include/* - dolib lib/* + dolib.so lib/libpythia8.so insinto "${PYTHIADIR}" doins -r share/Pythia8/xmldoc examples/Makefile.inc - echo "PYTHIA8DATA=${EPYTHIADIR}/xmldoc" >> 99pythia8 - doenvd 99pythia8 + newenvd - 99pythia8 <<- _EOF_ + PYTHIA8DATA=${EPYTHIADIR}/xmldoc + _EOF_ dodoc AUTHORS GUIDELINES README if use doc; then - dodoc share/Pythia8/pdfdoc/* - dohtml -r share/Pythia8/htmldoc/* + dodoc -r share/Pythia8/pdfdoc/. + dodoc -r share/Pythia8/htmldoc/. fi if use examples; then # reuse system Makefile.inc @@ -175,7 +178,7 @@ src_install() { sed -i "s:include Makefile.inc:include ${EPYTHIADIR}:" \ examples/Makefile || die - insinto /usr/share/doc/${PF} + insinto /usr/share/${PN} doins -r examples docompress -x /usr/share/doc/${PF}/examples fi |