Respect CFLAGS.

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

4 files changed, 36 insertions, 10 deletions

diff --git a/x11-terms/sakura/ChangeLog b/x11-terms/sakura/ChangeLog
index a31308357df7..503b10b09315 100644
--- a/x11-terms/sakura/ChangeLog
+++ b/x11-terms/sakura/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/sakura
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/sakura/ChangeLog,v 1.20 2011/09/20 03:58:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/sakura/ChangeLog,v 1.21 2011/10/24 21:53:02 radhermit Exp $
+
+  24 Oct 2011; Tim Harder <radhermit@gentoo.org> sakura-2.4.2.ebuild,
+  +files/sakura-2.4.2-cflags.patch:
+  Respect CFLAGS.
 
   20 Sep 2011; Tim Harder <radhermit@gentoo.org> sakura-2.3.8.ebuild,
   sakura-2.4.0.ebuild, sakura-2.4.1.ebuild:
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 34c887c99333..401b4e14b1e7 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX sakura-2.4.2-cflags.patch 588 RMD160 a680607ce4b1009735bd07b180df133a0827316a SHA1 6fdc75227882d7665bc5f5d0f48976a3e9dda84c SHA256 1c048e2c74f9d2b039e480b078e110a396cfa17b96882ab6702c8d30073bc3f8
 DIST sakura-2.3.8.tar.bz2 38623 RMD160 57787df9c1f695c7dd20c17125af9f57d6f09675 SHA1 d95016484734a10ef1966431c8f5e2d923040a0f SHA256 14fde5a006a82e1373cb548fb0488ec7c8ba6cd6a45d00a505ca3edc7b80d2bd
 DIST sakura-2.4.0.tar.bz2 40996 RMD160 4b643492b56065bd5093a40ff813bef50e46f7a4 SHA1 417508be2551ff82e6bad8868832ef634479a432 SHA256 10ac2bf87edb5385728e0e1fcfd31db012a388a380305e7ca6faedb18aca698a
 DIST sakura-2.4.1.tar.bz2 42017 RMD160 c778e109c9326104c4cd543ea7acf0f4ec98875e SHA1 43858ba79574b4e9413aefd19131dc21c9c1f575 SHA256 f4f8970b1ad171973c12d86fa5b016121723df013763693e27029c619d832504
@@ -8,15 +9,17 @@ DIST sakura-2.4.2.tar.bz2 42082 RMD160 487c148b9ebd0da74908e4241004acc2e8db40f1
 EBUILD sakura-2.3.8.ebuild 650 RMD160 d0ba60ae97343fa66d32e07880871638a85d155b SHA1 05182eb9f3f9cbd893938dd8747385eb2a04d959 SHA256 1cb71add5c9201dd3fbf4a0f1a0919dd9fcf6613b83ced9773cad426cd988a50
 EBUILD sakura-2.4.0.ebuild 880 RMD160 036b68f0c33ab4a4a0e1ee51ed343cede8757e0c SHA1 ef809ac93c50026332126c587058844e4505b6fa SHA256 97cdef70bc96dc4c5997e1e82874f3a7e80ccfa9abeec7c81b172bc0f8551cf7
 EBUILD sakura-2.4.1.ebuild 947 RMD160 dd18b008178838d1908994e9d90bcae96e6af355 SHA1 f04de65cc7ca95b15e7a5e28944a2ccde9fa47b1 SHA256 06a2d574a62ab10d5d7a50f7d03510885f5f65cce987ae897fdeabcd1141e694
-EBUILD sakura-2.4.2.ebuild 925 RMD160 12e4f423d1b36c42dd5fd6bebfcc08c640546363 SHA1 790f8c96636d42e548ab6ccbfb499f1aa02ce96d SHA256 be9f18b37fe3106b92c36ba99768f212b9eb1a577321a973e7fd290a4e27442e
-MISC ChangeLog 3211 RMD160 46561e83dc8d38c681ac6ed8054282b03a43cc82 SHA1 e33b26354ff9978dcf2d2e06a3282b78ad6a73d2 SHA256 39b9641c84d0f853d252f3d193465503eb6eb2be26e190c8cd847bc3f3a5faa6
+EBUILD sakura-2.4.2.ebuild 989 RMD160 bf6660bbf4354eeb0c05ededa08411f540a8f717 SHA1 ceab53658fe4b3f2087bb0aec24170c484d2c40d SHA256 f549897dd2c0f8a5fa05941d800e1cb3ffffbc5b79d4240c95dd28a2951181b1
+MISC ChangeLog 3336 RMD160 9b2d15e856e6d67a0d87df51178bc4ec5c85c6ee SHA1 83411b572477a11a0f86694466b7a6acb657110d SHA256 16b7d16fe88ad08ccbbb13aef0f7070139c069ae3f8594c0ce686790c95f0e61
 MISC metadata.xml 786 RMD160 fd0d38af42764db0cdddd72d1f333587c21f93e1 SHA1 25b25e1d1b0ccbb9d5e01319025ac539f342ecdb SHA256 f111323a458f7d7bdade61621abcb25d73214ee7c5f736fd09ccca3b1bb57678
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59usoACgkQfXuS5UK5QB3vHgP+PgBDIU+gQkPb2F4Vr1zs1vzk
-gY09Ohiwad6IXnDQ/FYyxcT6JeeTQtY0eIxgAZwejm59G3rT5cj5rc+XB33ypVhb
-SprCzRo1MT9+DAEHm/yqS3KP6KufEpFR4flRJmdKEkOv2ITcl9GP5Kw3dQeIgl4X
-Fx2+NYYkPfo4txOVRzY=
-=eryE
+iQEcBAEBCgAGBQJOpd5EAAoJEEqz6FtPBkyjA5IH/0Q8pSSlBvUcPtRsPqVsHY2K
+XpQhS7WYpfqPQlqBNl+gesKrWDT6hoW32rX93d66jZ1V25IaWl/Rw+rF5rn7UhQ1
+WylYATs7rYdlRZl3lKPWNRt32WV2SZkeL2RVbSXinv7D2FVmRzS8mLRM81jEgAhu
+AOgd15/WvXgPhg2taIT+Zb2t+kkQK/uNkHnHjZ/ZCwZ2gTsUu5EnKKOuCGO8a1yr
+lwDXLZikhZWSqY5IHAGSE1DkdEUsVr3K+IEpgz7EAWTBdMw8caUexsaJlJn7e4+u
+3Pb+hrRPG/xBNWQ2etc6b1WTQbAww1zTGal29J5J/5Qy+lLRm2H/cEokK2z/Qpo=
+=+jbV
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/sakura/files/sakura-2.4.2-cflags.patch b/x11-terms/sakura/files/sakura-2.4.2-cflags.patch
new file mode 100644
index 000000000000..bfa2d745c015
--- /dev/null
+++ b/x11-terms/sakura/files/sakura-2.4.2-cflags.patch
@@ -0,0 +1,15 @@
+--- sakura-2.4.2/CMakeLists.txt.orig
++++ sakura-2.4.2/CMakeLists.txt
+@@ -35,12 +35,6 @@
+ ADD_DEFINITIONS (-DDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/share\\\")
+ ADD_DEFINITIONS (-DBUILDTYPE=\\\"${CMAKE_BUILD_TYPE}\\\")
+ 
+-IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "-Wall")
+-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "-O2")
+-ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-
+ INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
+ LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS})
+ LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES})
diff --git a/x11-terms/sakura/sakura-2.4.2.ebuild b/x11-terms/sakura/sakura-2.4.2.ebuild
index 79e57d05c587..abccd147825a 100644
--- a/x11-terms/sakura/sakura-2.4.2.ebuild
+++ b/x11-terms/sakura/sakura-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/sakura/sakura-2.4.2.ebuild,v 1.1 2011/09/20 03:55:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/sakura/sakura-2.4.2.ebuild,v 1.2 2011/10/24 21:53:02 radhermit Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
 DOCS=( AUTHORS INSTALL )
 
 src_prepare() {
@@ -35,4 +37,6 @@ src_prepare() {
 			rm -f po/${lang}.po || die
 		fi
 	done
+
+	base_src_prepare
 }