summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Jezak <josejx@gentoo.org>2009-03-20 02:00:50 +0000
committerJoseph Jezak <josejx@gentoo.org>2009-03-20 02:00:50 +0000
commit9afe50bbfa96effb8b2d5afa64855e22781ab428 (patch)
tree9c4361e2ab136251c00d8bc7727cf23472fff2e6 /app-text/kbedic
parentVersion bump (diff)
downloadgentoo-2-9afe50bbfa96effb8b2d5afa64855e22781ab428.tar.gz
gentoo-2-9afe50bbfa96effb8b2d5afa64855e22781ab428.tar.bz2
gentoo-2-9afe50bbfa96effb8b2d5afa64855e22781ab428.zip
Patch for bug #226435. Some cleanup.
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'app-text/kbedic')
-rw-r--r--app-text/kbedic/ChangeLog9
-rw-r--r--app-text/kbedic/files/kbedic-4.0-dont-filter-cflags.patch15
-rw-r--r--app-text/kbedic/files/ppc-gfxopt.patch13
-rw-r--r--app-text/kbedic/kbedic-4.0.ebuild12
4 files changed, 29 insertions, 20 deletions
diff --git a/app-text/kbedic/ChangeLog b/app-text/kbedic/ChangeLog
index adc206a09b54..7d15a528da27 100644
--- a/app-text/kbedic/ChangeLog
+++ b/app-text/kbedic/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/kbedic
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/ChangeLog,v 1.20 2006/08/20 19:57:27 malc Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/ChangeLog,v 1.21 2009/03/20 02:00:50 josejx Exp $
+
+ 20 Mar 2009; Joseph Jezak <josejx@gentoo.org>
+ +files/kbedic-4.0-dont-filter-cflags.patch, -files/ppc-gfxopt.patch,
+ kbedic-4.0.ebuild:
+ Added patch for bug #226435, some cleanup.
20 Aug 2006; <malc@gentoo.org> kbedic-4.0.ebuild:
Stable on amd64
diff --git a/app-text/kbedic/files/kbedic-4.0-dont-filter-cflags.patch b/app-text/kbedic/files/kbedic-4.0-dont-filter-cflags.patch
new file mode 100644
index 000000000000..bb651babe638
--- /dev/null
+++ b/app-text/kbedic/files/kbedic-4.0-dont-filter-cflags.patch
@@ -0,0 +1,15 @@
+Only in kbedic-4.0-orig/: .acinclude.m4.swp
+diff -ur kbedic-4.0-orig/configure.in kbedic-4.0/configure.in
+--- kbedic-4.0-orig/configure.in 2008-06-18 20:13:26.000000000 -0700
++++ kbedic-4.0/configure.in 2008-06-18 20:40:23.225820760 -0700
+@@ -18,7 +18,9 @@
+ AC_PROG_INSTALL
+
+ dnl Enable debug information
+-AC_ENABLE_DEBUG
++dnl ##All this did was stop configure from trying to filter '-g' from CFLAGS,
++dnl ##better to just leave CFLAGS alone...
++dnl AC_ENABLE_DEBUG
+
+ dnl Checks for header files
+ AC_HEADER_STDC
diff --git a/app-text/kbedic/files/ppc-gfxopt.patch b/app-text/kbedic/files/ppc-gfxopt.patch
deleted file mode 100644
index 121f1f5d2bb5..000000000000
--- a/app-text/kbedic/files/ppc-gfxopt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure
-+++ configure
-@@ -1657,8 +1657,8 @@
- fi
-
- if test "$with_debug" = "no"; then
-- CXXFLAGS="`echo $CXXFLAGS | sed s/-g//`"
-- CFLAGS="`echo $CFLAGS | sed s/-g//`"
-+ CXXFLAGS="`echo $CXXFLAGS | sed s/\ -g\ //`"
-+ CFLAGS="`echo $CFLAGS | sed s/\ -g\ //`"
- fi
-
-
diff --git a/app-text/kbedic/kbedic-4.0.ebuild b/app-text/kbedic/kbedic-4.0.ebuild
index 102283dd8ad5..53ec1afc4f99 100644
--- a/app-text/kbedic/kbedic-4.0.ebuild
+++ b/app-text/kbedic/kbedic-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/kbedic-4.0.ebuild,v 1.13 2007/07/12 04:37:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/kbedic-4.0.ebuild,v 1.14 2009/03/20 02:00:50 josejx Exp $
inherit kde eutils
@@ -15,11 +15,13 @@ IUSE="kde"
DEPEND="=x11-libs/qt-3*
kde? ( >=kde-base/kdelibs-3 )"
+RDEPEND="${DEPEND}"
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/ppc-gfxopt.patch
+ cd "${S}"
+ epatch "${FILESDIR}/kbedic-4.0-dont-filter-cflags.patch"
+ eautoreconf
}
src_compile() {
@@ -36,6 +38,6 @@ src_install() {
kde_src_install
if use kde; then
insinto /usr/share/applnk/Utilities/kbedic.desktop
- doins ${FILESDIR}/kbedic.desktop
+ doins "${FILESDIR}/kbedic.desktop"
fi
}