Respect CFLAGS. #431110

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 60 insertions, 24 deletions

diff --git a/app-i18n/fbiterm/ChangeLog b/app-i18n/fbiterm/ChangeLog
index 408bd3beb501..f8a6d97548fa 100644
--- a/app-i18n/fbiterm/ChangeLog
+++ b/app-i18n/fbiterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/fbiterm
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.10 2008/11/24 16:52:22 matsuu Exp $
+# Copyright 2000-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.11 2012/08/18 15:57:43 naota Exp $
+
+  18 Aug 2012; Naohiro Aota <naota@gentoo.org> +files/fbiterm-0.5-cflags.patch,
+  fbiterm-0.5-r2.ebuild:
+  Respect CFLAGS. #431110
 
 *fbiterm-0.5-r2 (24 Nov 2008)
 
@@ -37,4 +41,3 @@
   files/fbiterm-0.5-gentoo.diff:
   Initial import. Ebuild submitted by Zhen Lin <lowzl@hotmail.com>.
   See bug #27700.
-
diff --git a/app-i18n/fbiterm/Manifest b/app-i18n/fbiterm/Manifest
index d5d75f3fb861..77e73a15904d 100644
--- a/app-i18n/fbiterm/Manifest
+++ b/app-i18n/fbiterm/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX fbiterm-0.5-cflags.patch 545 SHA256 f8a88c126f368843b71e1c44796063bc0a505a49b2d3ba7e2613a6315b32fbf7 SHA512 53f3ece39acf0436d77963235aefd2ef5d988b4d6272b454d2070ee7c75a7dfe98680650f1257a280bcba519d213ef30848412a337813c862d4529ea58c89329 WHIRLPOOL 57ea5df0cd3651a90035915eb8865609463f138263f4d2e41feb9e03b5185c1c25ecd5429b478318880e282a9f27554f467e055bfb10f4c70c5600b2ac62c1b0
 AUX fbiterm-0.5-r2-gentoo.diff 1139 SHA256 86cd5e2e6dcd0a54d5a5858bd4cff6398d248acdf0032833c79212587c252cb7 SHA512 760057a258b026bba463db65aeaf7a880e9a842e9437d29d9e8db1bf531bc3df6a28806edd4b2e2eac0f962f52438cb1a4c66e9571dd467c08f7dc2758e32632 WHIRLPOOL 4536cd030c3cd1714d4fc85d888c96dc8fcbc938e8322959163252547f5d793af89bff866ecd11eabbaa3101b77510fe8f3581f4a0572b206b9440ea4f20ae6a
 DIST iterm-0.5.tar.gz 608170 SHA256 4b0d2310f5e4a42bfe90c394cae51a26d2a9437716b7e4eee6a5202db9ef1424 SHA512 5b25abe9320fe3317e69048ee49b80e8b341952ac89df83d14ba2bd3893396b4348c257e0dd64ca00914485efc622dac2fbb6d2546b6360774777872a71a3695 WHIRLPOOL 9110e2a894a87fb108f93087583185117098d8be634530cf7162760e50531deb5649bd2dd4da4734effb1523a0eb8c5a7ebeccd57a67918726c7e445c9be9c58
-EBUILD fbiterm-0.5-r2.ebuild 1693 SHA256 0530b97c5881ba4d77d19a1683c4bdaed067d9adf2dcf1715a02ed2d79c232e7 SHA512 e288f5d6998ef4d07b97302a7b224e2f29a324d8e97801e35d3444e25fbcfb8f7d6024ccccd20f8251e3004a681a3246aa24cdf002c7caeea40a4fa1a02a8e9d WHIRLPOOL a2b22f11934ffdfc3985b12bf6bcdb613a1ebebd304c63ac3dd826a66e31ad5eee97578e7bd04a6682c4bb0e0c8f3ed30cc621fd960311ee8a01fcd5c8b8a611
-MISC ChangeLog 1505 SHA256 d5569fc7b4ce67b254eef7f8a7c249b0f0d82d4955635bc68c46aae6cc1e8a77 SHA512 75e2203d9827c3910c13b5060dad593b7fa6d2cf2749f68850ed4004742b26f9a6a4cb81b06360aaac88369c9ae8cbfe1afb8c6b629a3642d93cf0262da8142e WHIRLPOOL c81d6d5e14ec5322ee58000a38d67bf9cf3f54debd11f1cea00ff07a559d188d1f5a25443073596204745f0a59ba803eff062d0810b09608754a679174a195ab
+EBUILD fbiterm-0.5-r2.ebuild 1701 SHA256 48736c04237b488d9b158f050b47dbdde76d785dfd416a3731c1a2a510834d33 SHA512 4611e80fc93f68c9446b9c5bf9c140c34b5a4ff74bf27e2e42456a282c10a599d31977e1d6f199f4434ab72d3004931b415d659f0389e00ebfaf6521362690d1 WHIRLPOOL 43159e4781aecbefc55310595ff51702831f5769540cad8ae120a4dbbf4ecb7d424e4c117775d12787a31fd391aaeeba1bbdfb956d0d3ebd016d02b27327daec
+MISC ChangeLog 1635 SHA256 7649841cb810eb39fb5f9ac6e533821ea60fb764778c67e81306af50bb743fb9 SHA512 1fcd133a9edd0efca1abbf119b1862e19b7b655e26b743185a98a1f6343dd209bb9b712593ecc42abe564dc958d050b012d693af464700d334bb8cbdc339fa39 WHIRLPOOL b160a424ea42e03523f1f80b7b688359e90e032ba29b32b5b85ccaca00ae559cf70598129dba0e1f2c716ffda903dd6cd741395046663bd6da91aa46a75f3c72
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQL7tjAAoJEDYO1FT4VRUUuToP+wemoMrtgUO2SYOMdcUpdvah
+bFcvxtPFBF4yqI2UL1T1v/15ye0AJB7QDOxm4LSNLK2v+uM/6UqaWXMlvXz+lOax
+jWfXru/54KUCHcP8fdmAazjxnQaM1ndV1CTMI2ZLPSsBPebSMuhUwgWsp2ARuzRO
+GhbobVG4wJF3M9Gq1N0OhCu2s2x5FSTqXxt/pv2obTTmi+f7PNPjq0rxStPvN4NO
+M6XHVxK+Mcd761s3lPIW3HUdcfExlDSoFenN8h1vwF8j55NAuc60pbL2tS/emc+g
+a6WNJtgTwj6PkPolOLcxPdKRlETqeekbGQ7WymBQYNhSCIevbDy5v77zVbbsgGqX
+/zDVAi0GZL5SKoha8e3yVS59tn5ibYHQLVL8X1Ik86FQ2Z1IjtN0r6WudoSSlzgH
+tdvYn4gpeO/JT2d2Na4w+2oARpQ6IqvrPgWcILWu3aWYfOeYQ1ncWzc/Hb1ckF8P
+nCa5HEw09os3ojYSh9g8YAfCtZtuAUXWLwmMcOSZAT0EMojAL36V0YAlNyo5Ct1q
+mzXb/B/om1uEpV6SEdkxs/eSuGbPhltnmRsozFTlPRqSQQUAdNxxMNPjRpAEupQi
+s217gKSp08rxpkAgC8K3MJOdkcD2dDh0V5zLRKFxl5usS5IdlHew0YkOSSJQZ+IV
+vtqkJdmu8Z1jMixXIpuX
+=gluF
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild b/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild
index 04cf6852e859..83121d032991 100644
--- a/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild
+++ b/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild,v 1.1 2008/11/24 16:52:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild,v 1.2 2012/08/18 15:57:43 naota Exp $
 
-inherit autotools eutils multilib
+EAPI=4
+
+inherit autotools-utils eutils multilib
 
 IUSE=""
 
@@ -22,24 +24,21 @@ RDEPEND="${DEPEND}
 	media-fonts/font-sony-misc
 	media-fonts/unifont"
 
-S="${WORKDIR}/iterm/unix/fbiterm"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PF}-gentoo.diff"
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${PF}-gentoo.diff
+	"${FILESDIR}"/${P}-cflags.patch
+)
+DOCS=( AUTHORS ChangeLog README{,.jp,.zh_CN} )
+AUTOTOOLS_AUTORECONF=1
 
-src_compile() {
-	econf --x-includes=/usr/include \
-		--x-libraries=/usr/$(get_libdir) || die
-	emake || die
-}
+S="${WORKDIR}/iterm/unix/fbiterm"
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README*
+src_configure() {
+	local myeconfargs=(
+		--x-includes=/usr/include 
+		--x-libraries=/usr/$(get_libdir)
+	)
+	autotools-utils_src_configure
 }
 
 pkg_postinst() {
diff --git a/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch b/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch
new file mode 100644
index 000000000000..ae738c814202
--- /dev/null
+++ b/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/unix/fbiterm/src/Makefile.am b/unix/fbiterm/src/Makefile.am
+index 4ffe3da..53f12f4 100644
+--- a/unix/fbiterm/src/Makefile.am
++++ b/unix/fbiterm/src/Makefile.am
+@@ -17,7 +17,7 @@ fbiterm_SOURCES = \
+ fbiterm_LDADD = \
+ 	-L$(libdir) @X_LIBS@ -lm -lXfont -literm -lfreetype
+ 
+-CFLAGS = -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
++CFLAGS += -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
+ 
+ install-exec-hook:
+ 	chmod u+s $(DESTDIR)$(bindir)/fbiterm