jer 14/08/07 10:04:51 Modified: nkf-2.1.3.ebuild ChangeLog Log: Do not inject CFLAGS. Unconditionally patch. Convert sed script to patch. (Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 app-i18n/nkf/nkf-2.1.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild?r1=1.1&r2=1.2 Index: nkf-2.1.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nkf-2.1.3.ebuild 1 Dec 2013 07:21:09 -0000 1.1 +++ nkf-2.1.3.ebuild 7 Aug 2014 10:04:51 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v 1.1 2013/12/01 07:21:09 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v 1.2 2014/08/07 10:04:51 jer Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -18,14 +18,12 @@ src_prepare() { sed -i \ - -e "/^CFLAGS/s:-O2:${CFLAGS}:" \ + -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \ -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \ Makefile || die - - if use python; then - mv "${WORKDIR}/NKF.python" "${S}" || die - sed -i -e "s/-s/${CFLAGS}/" NKF.python/setup.py || die - fi + + mv "${WORKDIR}/NKF.python" "${S}" || die + epatch "${FILESDIR}"/${P}-strip.patch } src_compile() { 1.58 app-i18n/nkf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/nkf/ChangeLog?rev=1.58&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/nkf/ChangeLog?rev=1.58&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/nkf/ChangeLog?r1=1.57&r2=1.58 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- ChangeLog 1 Dec 2013 07:21:09 -0000 1.57 +++ ChangeLog 7 Aug 2014 10:04:51 -0000 1.58 @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/nkf -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.57 2013/12/01 07:21:09 matsuu Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.58 2014/08/07 10:04:51 jer Exp $ + + 07 Aug 2014; Jeroen Roovers <[email protected]> nkf-2.1.3.ebuild, + +files/nkf-2.1.3-strip.patch: + Do not inject CFLAGS. Unconditionally patch. Convert sed script to patch. *nkf-2.1.3 (01 Dec 2013)
