From 691edabeb73fa074f83eb0c47a09362e28590fa3 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Thu, 13 Jun 2013 16:43:33 +0200 Subject: net-misc/icmptx: Fix Makefile to get CC, RM, CFLAGS from environnmenet and so simplify build Package-Manager: portage-2.1.12.4 --- net-misc/icmptx/ChangeLog | 5 ++++ net-misc/icmptx/Manifest | 6 ++-- net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff | 6 ++-- net-misc/icmptx/icmptx-0.2.ebuild | 32 ++++++++-------------- 4 files changed, 23 insertions(+), 26 deletions(-) (limited to 'net-misc') diff --git a/net-misc/icmptx/ChangeLog b/net-misc/icmptx/ChangeLog index a9a25366..bccf7e7f 100644 --- a/net-misc/icmptx/ChangeLog +++ b/net-misc/icmptx/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Jun 2013; Bertrand Jacquin + files/icmptx-0.2-BJA-Makefile.diff, icmptx-0.2.ebuild: + net-misc/icmptx: Fix Makefile to get CC, RM, CFLAGS from environnmenet and so + simplify build + 10 Jun 2013; Bertrand Jacquin metadata.xml: Fix manifest diff --git a/net-misc/icmptx/Manifest b/net-misc/icmptx/Manifest index fee7d1bf..e2497ded 100644 --- a/net-misc/icmptx/Manifest +++ b/net-misc/icmptx/Manifest @@ -1,8 +1,8 @@ -AUX icmptx-0.2-BJA-Makefile.diff 618 SHA256 47b71e74481a046a1e5ecd23c065c1c8890975daa72f0943795a1197bc37e1db WHIRLPOOL df6c9a81c0eb463cab3aeafff10c3a2e6c2eeb386dff5aa6922904ae2c1b0b9e0dc2d0fad87e824fc6b109e091a30be8ce3ed9ec42439bbd3640837a5df5405c +AUX icmptx-0.2-BJA-Makefile.diff 621 SHA256 a8b69eed0e17aa9b3ca8d2fef44823648c94b6a07c26bac2cc02830db8993604 WHIRLPOOL d401e78ffe6e25efa47bd9bb9bf79efdda5c66837c145c624caca69000c9b0231e659d68a6010e7c82e344cf6cb0949139045e23e94af40201131324559c3f73 AUX icmptxcd.conf 326 SHA256 faa34b1718fa242d924a198a6143a4325e3c0527cffe9fccff60ddc8631d32d6 WHIRLPOOL 4c286867affa1ae17a3e680842be185df4b6f8e158fb56175c319979284389eadba33b3dbc0e62242854a48bf876dec44b0373620536c378682b8b392bfbf540 AUX icmptxcd.init 1220 SHA256 778360c4524615cd11c261661adb892e1b573fbb132c6fcec523d1f0149fefcf WHIRLPOOL 2c55a26a422dc38c54205a65ca066f1ea1900b9649ffae99c767b5e5848c0c8e294c7c9bd0e2634123f3724745ae2195440695416fd1ab0a414f6465d35c8478 AUX icmptxd.conf 327 SHA256 eafa579a4b39678609616197481afed2a0398edaca2ff291c2e002f3fb422a4e WHIRLPOOL 22ea7e53203d11716c90f5d6bf8ff812d42e52749b5e88bb83720dfbd12d1ddb8d991095bcf28c3d581b9701dfc8a3718d2946979a456572cf9287087fccd6df AUX icmptxd.init 1236 SHA256 1283f0d0c855100218a6cbd7ffd14158a5d7c7d46e5963ecc4c5db08aeb011a8 WHIRLPOOL d3102a4dec53f41edf39599e21d3a4eefe47d474ef598ef87479ec4399ca353cab48d46c058db8e5c21c41f299f482deae05e87d77b94ad7165686df81242fde -EBUILD icmptx-0.2.ebuild 971 SHA256 ab3d672b86204128da62d4f0ebcbcbac854171a5b2839892c3846dd0ec3442ef WHIRLPOOL 4565ff245b0d4031aa2641eddda40c3c22bf2749945c5d4be2af1c58736f18ea2f8865c00b0658d0a413c94d37cbff32aa66ecc7bbdafc9956ea8bdf31d4a874 -MISC ChangeLog 1788 SHA256 592a0948065e6ca475750af3d241254fdd97e4e1c222c14e779ce660e01790ae WHIRLPOOL d047d401930457a1aac8fb76c23ec52760193e495e2aab20df83907949f32569d063b6712dd9d2a0e342303d06f264e563042e819329e279e4b65172048e3c93 +EBUILD icmptx-0.2.ebuild 808 SHA256 610d7ea8b0e32fc04ae52fe52b3d70bf82ff6466594f04a3ec427c3fc5e9360d WHIRLPOOL 0292c1fa30dd97f35b837a88ddc8c4432103a06b563baee2f219c1bd7cf88f56ae60ca7e888dae2aef56074f2877451f61400b7287fbc952e6c9717bb63bda6a +MISC ChangeLog 1996 SHA256 c7b54dcc79ea9645d888a26da1c70ad68fa0bced19f114f21600889f440870b5 WHIRLPOOL f4ddd510694ee9f9738ae3832ed3585ff2d9464423e66ce38c9eced81f3eab15d8c3907d3a1217e99188084cd11faf94a333746eb0d996adca9538a85fccb44b MISC metadata.xml 389 SHA256 4246fdb04df76c59ad02d600c661f61f1fe7f597f6b839baa7bf53a449e4ef13 WHIRLPOOL 81eaf8d1fecf514f5f1bfb9736d3f91b0846bb251e7ad6b27a3ee50a02977899842e5c544b0b71799401f005ad641eb091f4f2c52fa2091d442e7ea4888919fa diff --git a/net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff b/net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff index 404759b8..2ceb89be 100644 --- a/net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff +++ b/net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff @@ -5,7 +5,7 @@ +NAME = icmptx -all: icmptx -+CFLAGS = \ ++CFLAGS ?= \ + -g -icmptx: it.o icmptx.c tun_dev.o @@ -21,8 +21,8 @@ -tun_dev.o: tun_dev.c - gcc $(flags) -c tun_dev.c -+RM = rm -f -+CC = gcc ++RM ?= rm -f ++CC ?= gcc + +all: $(NAME) + diff --git a/net-misc/icmptx/icmptx-0.2.ebuild b/net-misc/icmptx/icmptx-0.2.ebuild index b73f05b7..4467296b 100644 --- a/net-misc/icmptx/icmptx-0.2.ebuild +++ b/net-misc/icmptx/icmptx-0.2.ebuild @@ -6,32 +6,23 @@ EAPI=5 inherit git-2 linux-info DESCRIPTION="IP over ICMP tunnel" -EGIT_REPO_URI="git://github.com/jakkarth/${PN}.git" -EGIT_COMMIT="${PV}" HOMEPAGE="https://github.com/jakkarth/icmptx" -RDEPEND="virtual/libc" -DEPEND="virtual/os-headers - ${RDEPEND}" -KEYWORDS="~amd64 ~x86 ~ppc" +LICENSE="GPL-3" +KEYWORDS="~amd64 ~x86 ~ppc" +SLOT="0" IUSE="client server" REQUIRED_USE="|| ( client server )" -LICENSE="GPL-3" -SLOT="0" -RESTRICT="mirror" +EGIT_REPO_URI="git://github.com/jakkarth/${PN}.git" +EGIT_COMMIT="${PV}" CONFIG_CHECK="~TUN" -src_prepare () { +src_prepare() { epatch "${FILESDIR}/${P}-BJA-Makefile.diff" -} -src_compile () { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" + tc-export CC } src_install() { @@ -39,11 +30,12 @@ src_install() { dodoc README if use client ; then - newinitd "${FILESDIR}"/icmptxcd.init icmptxcd - newconfd "${FILESDIR}"/icmptxcd.conf icmptxcd + newinitd "${FILESDIR}/icmptxcd.init" icmptxcd + newconfd "${FILESDIR}/icmptxcd.conf" icmptxcd fi + if use server ; then - newinitd "${FILESDIR}"/icmptxd.init icmptxd - newconfd "${FILESDIR}"/icmptxd.conf icmptxd + newinitd "${FILESDIR}/icmptxd.init" icmptxd + newconfd "${FILESDIR}/icmptxd.conf" icmptxd fi } -- cgit v1.2.3