From 334607f73c14ff4db467b2ab51d6bb1eaea0141a Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Fri, 30 Nov 2012 18:23:37 +0000 Subject: Revision bump: EAPI 4, add ~amd64 keyword, respect LDFLAGS wrt bug #337359, drop old revision (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit) --- www-misc/multisort/ChangeLog | 9 ++++++++- www-misc/multisort/multisort-1.1-r1.ebuild | 31 ++++++++++++++++++++++++++++++ www-misc/multisort/multisort-1.1.ebuild | 24 ----------------------- 3 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 www-misc/multisort/multisort-1.1-r1.ebuild delete mode 100644 www-misc/multisort/multisort-1.1.ebuild (limited to 'www-misc/multisort') diff --git a/www-misc/multisort/ChangeLog b/www-misc/multisort/ChangeLog index a31472100f07..7f8683264e3b 100644 --- a/www-misc/multisort/ChangeLog +++ b/www-misc/multisort/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-misc/multisort # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/multisort/ChangeLog,v 1.3 2012/11/27 18:45:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/multisort/ChangeLog,v 1.4 2012/11/30 18:23:37 pinkbyte Exp $ + +*multisort-1.1-r1 (30 Nov 2012) + + 30 Nov 2012; Sergey Popov -multisort-1.1.ebuild, + +multisort-1.1-r1.ebuild: + Revision bump: EAPI 4, add ~amd64 keyword, respect LDFLAGS wrt bug #337359, + drop old revision 27 Nov 2012; Pacho Ramos metadata.xml: Drop apache herd as discussed in http://www.gossamer- diff --git a/www-misc/multisort/multisort-1.1-r1.ebuild b/www-misc/multisort/multisort-1.1-r1.ebuild new file mode 100644 index 000000000000..f6c2a1de0062 --- /dev/null +++ b/www-misc/multisort/multisort-1.1-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-misc/multisort/multisort-1.1-r1.ebuild,v 1.1 2012/11/30 18:23:37 pinkbyte Exp $ + +EAPI=4 + +inherit toolchain-funcs + +DESCRIPTION="multisort takes any number of httpd logfiles in the Common Log Format and merges them together" +HOMEPAGE="http://www.xach.com/multisort/" +SRC_URI="http://www.xach.com/${PN}/${PN}-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" + +src_prepare() { + # respect LDFLAGS wrt bug #337359 + sed -i -e 's/$(CFLAGS)/& \$(LDFLAGS)/' Makefile || die 'sed on Makefile failed' +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dosbin multisort +} diff --git a/www-misc/multisort/multisort-1.1.ebuild b/www-misc/multisort/multisort-1.1.ebuild deleted file mode 100644 index 0da012ff1f70..000000000000 --- a/www-misc/multisort/multisort-1.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/multisort/multisort-1.1.ebuild,v 1.2 2005/07/10 01:23:03 swegener Exp $ - -inherit toolchain-funcs - -DESCRIPTION="multisort takes any number of httpd logfiles in the Common Log Format and merges them together" -HOMEPAGE="http://www.xach.com/multisort/" -SRC_URI="http://www.xach.com/${PN}/${PN}-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="" - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - dosbin ${S}/multisort -} -- cgit v1.2.3-65-gdbad