diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
| commit | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch) | |
| tree | 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /net-misc/tiers | |
| parent | bd4aeefe33e63f613512604e47bfca7b2187697d (diff) | |
gentoo resync : 10.11.2019
Diffstat (limited to 'net-misc/tiers')
| -rw-r--r-- | net-misc/tiers/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/tiers/tiers-1.1.ebuild | 43 |
2 files changed, 24 insertions, 21 deletions
diff --git a/net-misc/tiers/Manifest b/net-misc/tiers/Manifest index 166202ae5163..3b547bc8ec3f 100644 --- a/net-misc/tiers/Manifest +++ b/net-misc/tiers/Manifest @@ -2,5 +2,5 @@ AUX tiers-1.1-gcc43.patch 3170 BLAKE2B 58deb7b271f90d681a4560af610e5109bd2464628 AUX tiers1.1-gccfixes.patch 5840 BLAKE2B 432bf2a8dd67b0a14af699e8a505e3dff93f439aeef31a23295a2dbf69abc6cdd6a411be7cd457cf611e0ed089b96e3f298c781b188be5a5adb33a0b2278159b SHA512 81913aa857d3251c358e91aa1644324399e60cf1bf7811ccc96d482ee4d56c5ba38138b882380f39d842e78f44d9d985465221b98283d2654bb8f4898552775e DIST tiers1.1.tar.gz 392532 BLAKE2B 0d729b48bb24feeb98b5584e15bf5ce572bc1c959830de97f8f601ff0cc38bdb3d39152e9644a5437b2cf4d29a5c43e8f2729666c8568227f2a3e5077919048c SHA512 b72a98aeeb3e1799536e1424e8f60bffcef59c61cc709232a670174c80d23fb4c3b60249c7ff2a33442b62b81a493b7ecef4bf0e950147fa8fe81bb9eabb9a08 DIST tiers2ns-lan.awk 3258 BLAKE2B 5a6838cc332cdd617f17d01ae56494d12f43344cbb36c5e39766c4c0481a300607a7bab8922918de22d72661e92d51bca0645ea436c3b95958e448d1b42a6f25 SHA512 562204765e0e7c973e6d88c494e5aba9cd47d79c68309359cd232c34be6175f727411a64a6033a246a042987f1ad423008857eaf25c6254bd006c4a3ff4d083e -EBUILD tiers-1.1.ebuild 1313 BLAKE2B b4f4f529aa1dfb8de1098360ade65dcd4ae9cd9136e663d19bf0e7a5370ab532ded19e579ddd8aba16ea9cafbf52f864d61a74e8b18d68f1cf9b23c60de838e4 SHA512 f923e05f4dc76a75063a15f61e273ec640c4dc0f41ee2ac08b568c55b3440ae971da0602c4e254441d037a21f063c59ead6a212722c4f3dba0e5f06eccbac529 +EBUILD tiers-1.1.ebuild 1280 BLAKE2B 7a4f0477a24980f65664fb63c693dc3f012b7e467aa373d93230d8cf731474dc3044d38eed10d097fa0f371cd1044bb34fe748b63d4a068a217a01d7e9418b8b SHA512 405adf240436b9a429bcede1aaf7cad6a98be46f486cade3dafd7f1d76389d9cfa068f233371eb4b952d15b54b2f2f5b8585503d1ab9d75fc7334799d676dc0c MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd diff --git a/net-misc/tiers/tiers-1.1.ebuild b/net-misc/tiers/tiers-1.1.ebuild index c8d77c98bb19..5d489c5a5959 100644 --- a/net-misc/tiers/tiers-1.1.ebuild +++ b/net-misc/tiers/tiers-1.1.ebuild @@ -1,42 +1,45 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 - -inherit eutils +EAPI=7 MY_P="${PN}${PV}" DESCRIPTION="Random network topography generator" HOMEPAGE="http://www.isi.edu/nsnam/ns/ns-topogen.html#tiers" SRC_URI="http://www.isi.edu/nsnam/dist/topogen/${MY_P}.tar.gz - http://www.isi.edu/nsnam/dist/topogen/tiers2ns-lan.awk" + http://www.isi.edu/nsnam/dist/topogen/tiers2ns-lan.awk" LICENSE="mapm" SLOT="0" KEYWORDS="~amd64 ~ppc x86" IUSE="" -DEPEND="sys-devel/gcc" -RDEPEND="virtual/awk - sci-visualization/gnuplot" - -S=${WORKDIR}/${PN}${PV} +RDEPEND="sci-visualization/gnuplot + virtual/awk" -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" +S=${WORKDIR}/${MY_P} - epatch "${FILESDIR}"/${MY_P}-gccfixes.patch - epatch "${FILESDIR}"/${P}-gcc43.patch - sed -e '1a\#!/bin/sh' -e '1d' -e "s|-f |-f /usr/share/${PN}/|g" -i "${S}"/bin/strip4gnuplot3.5 +src_prepare() { + default + eapply "${FILESDIR}"/${MY_P}-gccfixes.patch + eapply "${FILESDIR}"/${P}-gcc43.patch + sed -e '1a\#!/bin/sh' \ + -e '1d' \ + -e "s|-f |-f /usr/share/${PN}/|g" \ + -i "${S}"/bin/strip4gnuplot3.5 || die } src_compile() { - cd "${S}"/src - emake CFLAGS="${CFLAGS}" CONFIGFILE="/etc/tiers-gnuplot.conf" EXEC="../bin/tiers-gnuplot" || die + emake -C src \ + CFLAGS="${CFLAGS}" \ + CONFIGFILE="/etc/tiers-gnuplot.conf" \ + EXEC="../bin/tiers-gnuplot" # cleanup for a sec - rm *.o - emake CFLAGS="${CFLAGS}" CONFIGFILE="/etc/tiers.conf" EXEC="../bin/tiers" || die + rm src/*.o || die + emake -C src \ + CFLAGS="${CFLAGS}" \ + CONFIGFILE="/etc/tiers.conf" \ + EXEC="../bin/tiers" } src_install() { |