From 2b259c6f8a823dcb813db96e36dd8936db662ac8 Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Wed, 18 Jul 2012 11:27:59 +0000 Subject: Respect CFLAGS. #426789; Set CC properly. Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64 --- app-i18n/kanjipad/ChangeLog | 7 ++++-- app-i18n/kanjipad/Manifest | 25 ++++++++++++++++++++-- .../kanjipad/files/kanjipad-2.0.0-cflags.patch | 19 ++++++++++++++++ app-i18n/kanjipad/kanjipad-2.0.0.ebuild | 9 +++++++- 4 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch (limited to 'app-i18n') 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 + +files/kanjipad-2.0.0-cflags.patch, kanjipad-2.0.0.ebuild: + Respect CFLAGS. #426789; Set CC properly. 03 May 2012; Jeff Horelick kanjipad-2.0.0.ebuild: dev-util/pkgconfig -> virtual/pkgconfig @@ -38,4 +42,3 @@ 10 Jul 2002; Stuart Bouyer kanjipad-1.2.3.ebuild: Initial import of kanjipad ebuild. - diff --git a/app-i18n/kanjipad/Manifest b/app-i18n/kanjipad/Manifest index 5a960a740a7a..af311d5e1cba 100644 --- a/app-i18n/kanjipad/Manifest +++ b/app-i18n/kanjipad/Manifest @@ -1,6 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX kanjipad-2.0.0-cflags.patch 613 SHA256 eb85a450f39577a4f850b544db307ee5d5068a08700591ccf25caad91aa40721 SHA512 2164e5ff2202cd4314ee2d8dcc98f6d428748c3c62251c89daae83466a4a4b59bb08655d1bd98a5725569e680f1cfc25f3cd971919d3ffa20c78d38dd895b402 WHIRLPOOL bcf07a38ee22b6e3f86aa256817a7bf8a890ce9b54ddf33a888dcf71dba2f1f84fdc2dbc8e86619f710a0fc9c24265d5024bf4edaecde0a760cbc25820e38c78 DIST kanjipad-1.2.3.tar.gz 77173 SHA256 578fee5a313a691dfae9882d0ac2eb148dcb2fe67b91e18f0d5b612898846f7d SHA512 f00b6f35248b61c98fa9e98b01d5c1449de41a3ff18b84d3eaf10ed03eda38b0f603446c2a5102639711fcc62ee2cda2ac15e3c0fe02a2b116d8fa1b73f6e164 WHIRLPOOL 3147c6f688bac2221969137c76c533e1df6d774cf8ea664e1c1e930a06f6f18b3365ec065ff85ae7da00393d20eb7bbd6332acdbe16db99c6864ae60f3bfae10 DIST kanjipad-2.0.0.tar.gz 75930 SHA256 28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1 SHA512 66a38597358f97a9b43c3d1f4a9d6cf583b6158350131bae3b4d47edb167877def8eff4dde666c41549accb54c7256e08403985bb06d56758050a46d5b471ef6 WHIRLPOOL e94dfc8be761ded30eeb09c33c80cd23af99135fc68a890ceb71bdb7508f3a88264cb21f69d93259a1e2101f769cc7114968be856eeafbbcd00f587b743e770f EBUILD kanjipad-1.2.3.ebuild 754 SHA256 2ebe39fcbd0911fc3b2b0246bf2fc3a3e4273141eef10a57b7e4bd35c0f2bac0 SHA512 289806ba8ba6b4c3f0630cf9d288f97ad987560129c02f13c6e7d840c8aa22a0cc827bdc8b142906ffffb80edfdfe59cc0759a7e7a62b9495d94ab4bdf253bbf WHIRLPOOL 209ed35204e88a0e980ba33045cc36c2ae5baae5d504c501b66fcaec95c9ee93baba3db9fbbb1aad90ab07223c092a9354cbf6622f72e0672499a56f034df8f3 -EBUILD kanjipad-2.0.0.ebuild 826 SHA256 ea9fdc4730e461ce23d838d3c99c8c6f45b94f1e3c7c69c73dc466b2f0c3c376 SHA512 e06b6162f7d77ac4528b7499c5b79b81f297b6513bfac4e4cdc9324cf47421aee93c7ccd6f8618df673e6e32003e13649ba736de9390e0c3d148de9f46113cdb WHIRLPOOL 48e3495494eea283d252e636e8fe0a74c1eb491fa2ccb1c53aa865aaed567dbd27953946ec6b2e1f198074fdc748678ab06cd2ee56f30d82f2a57bf09b411295 -MISC ChangeLog 1481 SHA256 e6cbd31d528766c591cd1ac351b45dadd94d58ac5610a7ce537846d73f70bda7 SHA512 7125524c06c8b52dddcc00af7f83fc13f1b92a2204b812d883bd3ea9f39f926a9542050cc6b22c9468d50d049d0a16c55decbec36ba2d3073de40f7a3bbdc457 WHIRLPOOL 1b024ebc6edd8947df0bcd06a6aeba9210b5d1dd645a6ce9ef5dfd223d17b0c28b19393a8dfb2b57069ad9d3814f45484eabc63b81256b74e7762292cd22560e +EBUILD kanjipad-2.0.0.ebuild 930 SHA256 98fb2ebfb3f07f4f8f1a9be7908e827af259987abc237193daa8f8982474a6b0 SHA512 bd7fef6b0caa42bfdb755a3bb7f7aea070fa772050cf8582d85183f550424934d1a20c2751501570db0f8c14bb8a0bcfe83ec66622f8910c1637eb6b26ded322 WHIRLPOOL 1dd7151860366aec5a471b9cb60c238fe3c4bc7221e93b55a15c19d6683490fb909a9b4e2fe7d22305b6038785c9ad215c37daea43168fc619b4c94c251160df +MISC ChangeLog 1632 SHA256 f0aac323543cf8966dd8a14fc402d9dbdd254d1c214014de8e982fd59b6ca993 SHA512 25314e4695e208fda58fdc7f08113942a512eda44d1786df1c407b097ae5475e7b9f95dc214f71d57cda0a8eb8a2cfa5caf9d696c3f85eccc79ab7daaacd883e WHIRLPOOL 69e16c524e13c3951876e04dfd406bb4e26f5ad4141b199b807bc0c56e161f3eb59fc2ec22ca840b72ee73c824c5daf283a8633869b81fe96d8891054815eb61 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJQBp4WAAoJEDYO1FT4VRUUPqsP/iu2+1XsXF1ugV6VlX4M0GgP +fTfYrjXOMj0jJenKTKhLqN3HQDiaXexEN15o7VVfRPvcc+WSdUyy2+zvKUm5GC5s +P7BSUlxP+FWJ3rBIxyZAX7VhGzkijrRj6yP/MrM88zIF+tPK0d8I/6XyxoDeP5xF +j5VwUGf2VMiwAIr0uP7tLQGBrxA4z5znMPHvTvZPzceyTL3HdxXhcXs2G5A5ZHZx +cG243kDbIxiVR7GAKEy7boZ4PmKkdgaSq/kQHo7knfuVMqxt2bjlCNaq88K5XiQK +AYJYNPCYvUQq3h6n0g9e8QnaLA395YexpsuTiWJMssrAXuBsV0gHOmHFJk1PZjeA +XsX9yn/+t417ewSCgjX8/f7HXcRs+QXNJaXCAPtErXeScd6JjMjbygr9oBg0LHev +JXnJ7nGQcLKAk9B9hl5p9hIjlq3RcMb6AZXB+hdpt4jgANPV3UeYg2pnI+HBBoKV +e7DN8Uv8cb/UvwZAifPaYMTnvsdco7h4qd0O3uAatVMRfJ7Q34XGyORbokcnKlkA +bXkoxoLVlbo4uNyAhiJMMf6x74oLHpXphc552xP3E9jZbQ2yPFOFaW6KUZSjebxD +GGv1jmYSAE+11yc4qWVLbR90VJwDZZYaeNhsk+Db+Jc3xt6wF7V/TGR4f7X1kvkX +OG7JNlveImFAkcaYrheK +=eUKm +-----END PGP SIGNATURE----- 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 -- cgit v1.2.3-65-gdbad