summaryrefslogtreecommitdiff
path: root/sys-apps/grepcidr
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
commitd18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sys-apps/grepcidr
parente748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
gentoo resync : 15.06.2021
Diffstat (limited to 'sys-apps/grepcidr')
-rw-r--r--sys-apps/grepcidr/Manifest3
-rw-r--r--sys-apps/grepcidr/files/grepcidr-2.0-Makefile.patch12
-rw-r--r--sys-apps/grepcidr/grepcidr-2.0.ebuild18
3 files changed, 25 insertions, 8 deletions
diff --git a/sys-apps/grepcidr/Manifest b/sys-apps/grepcidr/Manifest
index 946e349b058f..0a0c2289b9a1 100644
--- a/sys-apps/grepcidr/Manifest
+++ b/sys-apps/grepcidr/Manifest
@@ -1,3 +1,4 @@
+AUX grepcidr-2.0-Makefile.patch 248 BLAKE2B dfc4918542b61ea19cd952c0c8ba5e7d5e3acdc4c4990efbc77df5fea5477eea77c427b0bd06e08e7d1a6c9c3059c4ae9689903d33165bcccd4e3683304a54ed SHA512 f34872363cc51d7715cf2695162e2a7a29582b62fa97e9d63b55c44cc6be68823f97b45aa914cf65f3d24c15ab55c5918734da00bb80ee895708ea16c687dbed
DIST grepcidr-2.0.tar.gz 16557 BLAKE2B 48fcb67eea8c2cdb193fbc3d75373a4da215db64f7f865418bec55d98a74fba4c56a74729181bf1aacd7817268b94b943b2625b8ed81dce746992f2aa746d975 SHA512 c592c7a96e5e711cb5ee10ea1f63907411f69c0014c0bdc845f4b026766b6466db624063af1411b994b53aa7e694fe99ecb1120c11543c5ea1b11afc9558f7aa
-EBUILD grepcidr-2.0.ebuild 562 BLAKE2B 8ba4498f2e0d16546ac82211fa0d412c34354c6f7ae02d9e93e3810c2e81038e54319772c71b0f19a6a3c422fa47f23b3fc40fa9f06d0b0e79760113bf982df7 SHA512 df53bdaf07d496229843698b4842e5d7550c79f53e0b191c8778ff51b1b852db3a4a9727808679d9fe7517f1c6427dea76b1646a3027e24e4c2652c0d8676a1a
+EBUILD grepcidr-2.0.ebuild 635 BLAKE2B be3234f324a3dbeb63fd0c1d62392785f6036a977d409dd8e9988faedb7347e0c71f4e893f5bc495ed1cebf9ee08e6fa2585baf1e0b11265a1c0d0cba906c689 SHA512 32e4c455daa04c30345382bea67039fc644eede503121c5a584e89d2d6696316a21149e54f8583f671550ebce3b52aee0f11d87a0f4c4037a982b7b5a9292014
MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/sys-apps/grepcidr/files/grepcidr-2.0-Makefile.patch b/sys-apps/grepcidr/files/grepcidr-2.0-Makefile.patch
new file mode 100644
index 000000000000..c1b0b56f2a11
--- /dev/null
+++ b/sys-apps/grepcidr/files/grepcidr-2.0-Makefile.patch
@@ -0,0 +1,12 @@
+Respect CPPFLAGS, LDFLAGS
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ LDFLAGS=
+ all: grepcidr
+
+ grepcidr: grepcidr.o
+- $(CC) $(CFLAGS) grepcidr.o -o grepcidr
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) grepcidr.o -o grepcidr
+
+ doc: grepcidr.1
+
diff --git a/sys-apps/grepcidr/grepcidr-2.0.ebuild b/sys-apps/grepcidr/grepcidr-2.0.ebuild
index 77b3863961fd..4b99fd34edbb 100644
--- a/sys-apps/grepcidr/grepcidr-2.0.ebuild
+++ b/sys-apps/grepcidr/grepcidr-2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit toolchain-funcs
@@ -12,17 +12,21 @@ SRC_URI="http://www.pc-tools.net/files/unix/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0-Makefile.patch
+)
src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
}
src_install() {
- emake DESTDIR="${D}" PREFIX="${EROOT}/usr" install
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
dodoc README ChangeLog
}