summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-10-23 13:20:11 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-10-23 13:20:11 +0000
commit4fafeb6f00ab9ac2646f6321c9e508afb5390dc6 (patch)
treec47d6b30467876e158fae9ed179360b5d8e8db93
parentnew release (Manifest recommit) (diff)
downloadgentoo-2-4fafeb6f00ab9ac2646f6321c9e508afb5390dc6.tar.gz
gentoo-2-4fafeb6f00ab9ac2646f6321c9e508afb5390dc6.tar.bz2
gentoo-2-4fafeb6f00ab9ac2646f6321c9e508afb5390dc6.zip
put in workaround for intltool-0.31.3 for libgnomedb-1.0.3 which uses older intltool-merge. (#68435)
-rw-r--r--gnome-extra/libgnomedb/ChangeLog8
-rw-r--r--gnome-extra/libgnomedb/libgnomedb-1.0.3.ebuild11
-rw-r--r--gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild3
3 files changed, 17 insertions, 5 deletions
diff --git a/gnome-extra/libgnomedb/ChangeLog b/gnome-extra/libgnomedb/ChangeLog
index 456eda8084a1..cbabb32c199f 100644
--- a/gnome-extra/libgnomedb/ChangeLog
+++ b/gnome-extra/libgnomedb/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-extra/libgnomedb
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.26 2004/10/22 07:57:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.27 2004/10/23 13:20:11 liquidx Exp $
+
+ 23 Oct 2004; Alastair Tse <liquidx@gentoo.org> libgnomedb-1.0.3.ebuild,
+ libgnomedb-1.0.4.ebuild:
+ put in workaround for intltool-0.31.3 for libgnomedb-1.0.3 which uses older
+ intltool-merge. removing intltoolize from 1.0.4 as it is not needed any
+ more. intltoolize was a workaround for problems with the 0.30 series.
22 Oct 2004; Alastair Tse <liquidx@gentoo.org> libgnomedb-1.0.4.ebuild:
removed intltoolize, not quite sure why its not working, but temporary
diff --git a/gnome-extra/libgnomedb/libgnomedb-1.0.3.ebuild b/gnome-extra/libgnomedb/libgnomedb-1.0.3.ebuild
index 3e4232aea1b8..c66966191bd1 100644
--- a/gnome-extra/libgnomedb/libgnomedb-1.0.3.ebuild
+++ b/gnome-extra/libgnomedb/libgnomedb-1.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-1.0.3.ebuild,v 1.7 2004/08/08 14:36:33 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-1.0.3.ebuild,v 1.8 2004/10/23 13:20:11 liquidx Exp $
inherit gnome2 eutils
@@ -28,8 +28,15 @@ DEPEND=">=dev-util/pkgconfig-0.8
src_unpack() {
unpack ${A}
- gnome2_omf_fix ${S}/doc/Makefile.in
+
+ # needed for intltool-0.30
cd ${S}; intltoolize --force || die
+ # needed for inttool 0.31.3, alternative to running aclocal which
+ # requires cvs files not in release tarball.
+ sed -e 's/@INTLTOOL_ICONV@/iconv/' -i intltool-merge.in
+
+ gnome2_omf_fix ${S}/doc/Makefile.in
+
# Avoid documentation problems. See bug #46275.
epatch ${FILESDIR}/${P}-gtkdoc_fix.patch
# Fix GCC 3.4 compilation. See bug #49236.
diff --git a/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild b/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild
index b2d82f22b942..071ebf213d49 100644
--- a/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild
+++ b/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild,v 1.4 2004/10/22 07:57:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild,v 1.5 2004/10/23 13:20:11 liquidx Exp $
inherit gnome2 eutils
@@ -30,7 +30,6 @@ src_unpack() {
unpack ${A}
gnome2_omf_fix ${S}/doc/Makefile.in
cd ${S}
- #intltoolize --force || die
# Avoid documentation problems. See bug #46275.
epatch ${FILESDIR}/${PN}-1.0.3-gtkdoc_fix.patch
# Add extra selector. See bug #48611.