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 | 2571d0f9f7fcf23c00aae7ab476c280cee0fc3e4 (patch) | |
| tree | 2b34d5f7a6a1c2e89fbdb4c7c2f6e1b5a56a2f83 /dev-libs/libhome | |
| parent | p.use.masking kde for x11-themes/qtcurve-qt4, as long as kde-4 is masked (diff) | |
| download | historical-2571d0f9f7fcf23c00aae7ab476c280cee0fc3e4.tar.gz historical-2571d0f9f7fcf23c00aae7ab476c280cee0fc3e4.tar.bz2 historical-2571d0f9f7fcf23c00aae7ab476c280cee0fc3e4.zip | |
Use sed rather than a patch to fix the bug, so that it's not thrown off by CVS keywords.
Package-Manager: portage-2.1.5.4
Diffstat (limited to 'dev-libs/libhome')
| -rw-r--r-- | dev-libs/libhome/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libhome/Manifest | 11 | ||||
| -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 |
4 files changed, 16 insertions, 24 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/Manifest b/dev-libs/libhome/Manifest index 8cb52c0e6e36..e89b7ade9b32 100644 --- a/dev-libs/libhome/Manifest +++ b/dev-libs/libhome/Manifest @@ -2,15 +2,14 @@ Hash: SHA1 AUX libhome-0.10.1-Makefile.patch 3064 RMD160 3078c3c35306a77e7dba4d6477511b3cd142b369 SHA1 42e6813359be9c56651dcc915e6155c3c70808aa SHA256 bfb763fc4fa5d7980a6df49c39fdb85bf1424c1e43406f47e5b1e10defd095ed -AUX libhome-0.10.1-fixlt.patch 566 RMD160 7c66741dbc872060026b3248c0319b762179f32b SHA1 d3db3dc6b4a566227cac2ca18099ba7690be3cc7 SHA256 80d20d66b88f6e639b9345f7c5a2483ac45430ea5151bb65ffd696d10cab8a9a DIST libhome-0.10.1.tar.gz 282420 RMD160 fa3e82c4c079be18fb5ff3148e91af805cea8f33 SHA1 90224bd0ba066c69f8408682808d953bdab1c8bc SHA256 25dff14d2a7e7f867f472c0627e157f76692a814d44c12e7b40248710627aefb -EBUILD libhome-0.10.1.ebuild 1136 RMD160 919495d52e8c19b1a0988be43cad917575a3c111 SHA1 41e30701e0145cf50dd39f2339417ec995fae311 SHA256 3a25023fd631a81ae5158493ecb2aadc4e5fea631b8c7b4cf8a9f39d953e691a -MISC ChangeLog 1211 RMD160 bf85f5a3a44f66b57381bfe372b7a6192a206487 SHA1 7b51c0f08ad707f8ced2980fbd65864131adab39 SHA256 520a4e77f0ae9294bb96a72250d6963b551932fa89ca15da7f98c96fa5c53637 +EBUILD libhome-0.10.1.ebuild 1168 RMD160 30eecb7cb442ef93b519e7b84e69896eefde76a3 SHA1 e844f045c8bb3ef7e63d37ea6b3ccb46836b9225 SHA256 a2e6a9e3dc78df3536cb5b3f4525cefdfd448324fe652de9badc940d1d0050ef +MISC ChangeLog 1418 RMD160 ad182d9995224b66c9ccca257e19fd87ab302aef SHA1 00f13d596c48eed874638446db0ee68f5a004606 SHA256 c4151bb837e38235acbd2cd49d7977b05ceea40a896f05d852aa4c7344d4f0a0 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkhNhEIACgkQAiZjviIA2XhLCgCfeXTIaYlREgmjTZn7y3TgCmaH -LPkAoL3U05VhDcHoc57B7lpFUvBVGanf -=aqaC +iEYEARECAAYFAkhOSZMACgkQAiZjviIA2XifbgCfY4a0UAa8bGIsmenBziUfIj9m +m1UAnieu3MVFruikTmZjk0CVoVYkokI/ +=0SO2 -----END PGP SIGNATURE----- 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 } |