summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-10-24 21:53:02 +0000
committerTim Harder <radhermit@gentoo.org>2011-10-24 21:53:02 +0000
commit1e483884809520b2d63379615ea47eab186b3014 (patch)
tree4d38d874ed61a51b350b415f0ff1d4975c2cfc96 /x11-terms/sakura
parentBug #388383: USE=-cgi installed the cgi files anyway, in /no/ due to bug in u... (diff)
downloadgentoo-2-1e483884809520b2d63379615ea47eab186b3014.tar.gz
gentoo-2-1e483884809520b2d63379615ea47eab186b3014.tar.bz2
gentoo-2-1e483884809520b2d63379615ea47eab186b3014.zip
Respect CFLAGS.
(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms/sakura')
-rw-r--r--x11-terms/sakura/ChangeLog6
-rw-r--r--x11-terms/sakura/files/sakura-2.4.2-cflags.patch15
-rw-r--r--x11-terms/sakura/sakura-2.4.2.ebuild6
3 files changed, 25 insertions, 2 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/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
}