diff options
author | Naohiro Aota <naota@gentoo.org> | 2012-07-18 11:27:59 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2012-07-18 11:27:59 +0000 |
commit | f56126b95be1f95a6e0581967bb2185b6300cfa0 (patch) | |
tree | 3c36b337900aabc318bace8098cd5514179126fe /app-i18n/kanjipad | |
parent | [net-irc/inspircd] Cleanup of 1.2 series. (diff) | |
download | gentoo-2-f56126b95be1f95a6e0581967bb2185b6300cfa0.tar.gz gentoo-2-f56126b95be1f95a6e0581967bb2185b6300cfa0.tar.bz2 gentoo-2-f56126b95be1f95a6e0581967bb2185b6300cfa0.zip |
Respect CFLAGS. #426789; Set CC properly.
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/kanjipad')
-rw-r--r-- | app-i18n/kanjipad/ChangeLog | 7 | ||||
-rw-r--r-- | app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch | 19 | ||||
-rw-r--r-- | app-i18n/kanjipad/kanjipad-2.0.0.ebuild | 9 |
3 files changed, 32 insertions, 3 deletions
diff --git a/app-i18n/kanjipad/ChangeLog b/app-i18n/kanjipad/ChangeLog index edeadcb4f3d6..c73fcbe93629 100644 --- a/app-i18n/kanjipad/ChangeLog +++ b/app-i18n/kanjipad/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/kanjipad # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/kanjipad/ChangeLog,v 1.14 2012/05/03 19:24:29 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/kanjipad/ChangeLog,v 1.15 2012/07/18 11:27:58 naota Exp $ + + 18 Jul 2012; Naohiro Aota <naota@gentoo.org> + +files/kanjipad-2.0.0-cflags.patch, kanjipad-2.0.0.ebuild: + Respect CFLAGS. #426789; Set CC properly. 03 May 2012; Jeff Horelick <jdhore@gentoo.org> kanjipad-2.0.0.ebuild: dev-util/pkgconfig -> virtual/pkgconfig @@ -38,4 +42,3 @@ 10 Jul 2002; Stuart Bouyer <stubear@gentoo.org> kanjipad-1.2.3.ebuild: Initial import of kanjipad ebuild. - diff --git a/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch b/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch new file mode 100644 index 000000000000..b1a6786bf17a --- /dev/null +++ b/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch @@ -0,0 +1,19 @@ +diff --git a/Makefile b/Makefile +index 4869923..0f7509c 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,4 @@ +-OPTIMIZE=-g -Wall ++OPTIMIZE=-Wall + #OPTIMIZE=-O2 + + GTKINC=$(shell pkg-config --cflags gtk+-2.0) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED +@@ -26,7 +26,7 @@ PACKAGE = kanjipad + VERSION = 2.0.0 + + OBJS = kpengine.o scoring.o util.o +-CFLAGS = $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\" -DBINDIR=\"$(BINDIR)\" ++CFLAGS += $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\" -DBINDIR=\"$(BINDIR)\" + + all: kpengine kanjipad jdata.dat + diff --git a/app-i18n/kanjipad/kanjipad-2.0.0.ebuild b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild index 733489f906a1..888df72e03fd 100644 --- a/app-i18n/kanjipad/kanjipad-2.0.0.ebuild +++ b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/kanjipad/kanjipad-2.0.0.ebuild,v 1.11 2012/05/03 19:24:29 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/kanjipad/kanjipad-2.0.0.ebuild,v 1.12 2012/07/18 11:27:58 naota Exp $ EAPI="2" +inherit eutils toolchain-funcs + DESCRIPTION="Japanese handwriting recognition tool" HOMEPAGE="http://fishsoup.net/software/kanjipad/" SRC_URI="http://fishsoup.net/software/kanjipad/${P}.tar.gz" @@ -18,7 +20,12 @@ RDEPEND="x11-libs/gtk+:2 DEPEND="${RDEPEND} virtual/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-cflags.patch +} + src_compile() { + tc-export CC perl -i -pe "s|PREFIX=/usr/local|PREFIX=/usr|; s|-DG.*DISABLE_DEPRECATED||g" Makefile || die |