diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-10 09:29:48 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-10 09:29:48 +0000 |
commit | 3558b3dadd1abbaf2d025fcb9c4029374fa7255f (patch) | |
tree | 4bd0fe5fcdd1a04b6b56e7cd9815394dc0805d54 /dev-libs | |
parent | p.use.masking kde for x11-themes/qtcurve-qt4, as long as kde-4 is masked (diff) | |
download | gentoo-2-3558b3dadd1abbaf2d025fcb9c4029374fa7255f.tar.gz gentoo-2-3558b3dadd1abbaf2d025fcb9c4029374fa7255f.tar.bz2 gentoo-2-3558b3dadd1abbaf2d025fcb9c4029374fa7255f.zip |
Use sed rather than a patch to fix the bug, so that it's not thrown off by CVS keywords.
(Portage version: 2.1.5.4)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libhome/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/libhome/files/libhome-0.10.1-fixlt.patch | 15 | ||||
-rw-r--r-- | dev-libs/libhome/libhome-0.10.1.ebuild | 7 |
3 files changed, 11 insertions, 18 deletions
diff --git a/dev-libs/libhome/ChangeLog b/dev-libs/libhome/ChangeLog index 00060ce6dfa3..b2488627695c 100644 --- a/dev-libs/libhome/ChangeLog +++ b/dev-libs/libhome/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libhome # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhome/ChangeLog,v 1.7 2008/06/09 19:27:57 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhome/ChangeLog,v 1.8 2008/06/10 09:29:48 flameeyes Exp $ + + 10 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> + -files/libhome-0.10.1-fixlt.patch, libhome-0.10.1.ebuild: + Use sed rather than a patch to fix the bug, so that it's not thrown off by + CVS keywords. 09 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> files/libhome-0.10.1-fixlt.patch: diff --git a/dev-libs/libhome/files/libhome-0.10.1-fixlt.patch b/dev-libs/libhome/files/libhome-0.10.1-fixlt.patch deleted file mode 100644 index 8970466deb26..000000000000 --- a/dev-libs/libhome/files/libhome-0.10.1-fixlt.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: libhome-0.10.1/configure.in -=================================================================== ---- libhome-0.10.1.orig/configure.in -+++ libhome-0.10.1/configure.in -@@ -21,8 +21,8 @@ dnl USA - dnl Process this file with autoconf to produce a configure script. - --define(VERSION, esyscmd([awk '{printf "%s", $0}' VERSION])) -+define(__PKG_VERSION, esyscmd([awk '{printf "%s", $0}' VERSION])) - --AC_INIT(libhome, VERSION, lwa@teaser.fr) -+AC_INIT(libhome, __PKG_VERSION, lwa@teaser.fr) - AC_REVISION($Revision: 1.2 $) - AC_CONFIG_HEADER(config.h) - AC_PREREQ(2.53) diff --git a/dev-libs/libhome/libhome-0.10.1.ebuild b/dev-libs/libhome/libhome-0.10.1.ebuild index 78d7591f5b92..7745e3f9b18f 100644 --- a/dev-libs/libhome/libhome-0.10.1.ebuild +++ b/dev-libs/libhome/libhome-0.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhome/libhome-0.10.1.ebuild,v 1.5 2008/06/09 15:51:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhome/libhome-0.10.1.ebuild,v 1.6 2008/06/10 09:29:48 flameeyes Exp $ inherit autotools db-use eutils @@ -25,7 +25,10 @@ src_unpack() { cd "${S}" rm -f aclocal.m4 epatch "${FILESDIR}"/${P}-Makefile.patch - epatch "${FILESDIR}"/${P}-fixlt.patch + + # bug 225579 + sed -i -e 's:\<VERSION\>:__PKG_VERSION:' configure.in + eautoreconf } |