put in workaround for intltool-0.31.3 for libgnomedb-1.0.3 which uses older intltool-merge. (#68435)

4 files changed, 23 insertions, 11 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/Manifest b/gnome-extra/libgnomedb/Manifest
index 72470fbf4536..b877f864af79 100644
--- a/gnome-extra/libgnomedb/Manifest
+++ b/gnome-extra/libgnomedb/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 137be40cc900c34f89a15b1e3e6acffa ChangeLog 4378
+MD5 88aedb0f97e3370701b4bf16f80c4821 ChangeLog 4704
 MD5 5338564d27c9ab0fdd3399d19d73edf6 libgnomedb-0.12.1.ebuild 1196
 MD5 d65098e3a9bb9b1ae8532658be499240 libgnomedb-1.0.1.ebuild 1260
-MD5 c1e897d17fe124f61d3719c56a483626 libgnomedb-1.0.3.ebuild 1475
-MD5 158f8edb15219409c0b0c4ebbad1251b libgnomedb-1.0.4.ebuild 1576
+MD5 b55c45e0b718d2c38286afd9b4649739 libgnomedb-1.0.3.ebuild 1675
+MD5 ef44941644dbf7ee95f14b2104936310 libgnomedb-1.0.4.ebuild 1547
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d48a0cec30d90af0c488dc4dbfc3e1a3 files/digest-libgnomedb-0.12.1 70
 MD5 5cd64f762a82a44123610969ca055ed7 files/digest-libgnomedb-1.0.1 69
@@ -17,7 +17,7 @@ MD5 37d21bd238913942c2c2815c0ae80041 files/libgnomedb-1.0.4-selector.patch 803
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBeL1vRkyva5PS18kRAoaFAJ99WGlryjcaKzgTEwLWZJmEm4tGNACfZPr7
-hRBgiC9fuYegN9NVP/uYgVI=
-=whWJ
+iD8DBQFBelqcRkyva5PS18kRApo1AKC6k1V+S90uvTt8rcbR0PN+2/9rzgCgpxh1
+6x2jP9JRNWauv62aHc5V2mM=
+=IF+4
 -----END PGP SIGNATURE-----
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.