Depend on gnome-extra/gucharmap:0 instead of >=gnome-extra/gucharmap-1.4.0 #393005; Add missing dependencies dev-util/gtk-doc-am (need to eautoreconf); Add underlinking dealing patch.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

3 files changed, 26 insertions, 3 deletions

diff --git a/app-i18n/libtomoe-gtk/ChangeLog b/app-i18n/libtomoe-gtk/ChangeLog
index 6496322da06d..043af5dd0f57 100644
--- a/app-i18n/libtomoe-gtk/ChangeLog
+++ b/app-i18n/libtomoe-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/libtomoe-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtomoe-gtk/ChangeLog,v 1.14 2011/10/23 22:00:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtomoe-gtk/ChangeLog,v 1.15 2011/12/07 14:19:27 naota Exp $
+
+  07 Dec 2011; Naohiro Aota <naota@gentoo.org> libtomoe-gtk-0.6.0-r2.ebuild,
+  +files/libtomoe-gtk-0.6.0-underlinking.patch:
+  Depend on gnome-extra/gucharmap:0 instead of >=gnome-extra/gucharmap-1.4.0
+  #393005; Add missing dependencies dev-util/gtk-doc-am (need to eautoreconf);
+  Add underlinking dealing patch.
 
   23 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   libtomoe-gtk-0.6.0.ebuild, libtomoe-gtk-0.6.0-r1.ebuild:
diff --git a/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch
new file mode 100644
index 000000000000..755b50a68eb0
--- /dev/null
+++ b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch
@@ -0,0 +1,15 @@
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 4f4206e..4a21629 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -42,8 +42,8 @@ LDADDS =							\
+ 
+ noinst_PROGRAMS = testtomoegtk testtomoegtkedit
+ 
+-testtomoegtk_LDADD = $(LDADDS)
++testtomoegtk_LDADD = $(LDADDS) -lm
+ testtomoegtk_SOURCES = testtomoegtk.c
+ 
+-testtomoegtkedit_LDADD = $(LDADDS)
++testtomoegtkedit_LDADD = $(LDADDS) -lm
+ testtomoegtkedit_SOURCES = testtomoegtkedit.c
diff --git a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild
index 781268dd9f60..3a7db2383b8e 100644
--- a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild
+++ b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild,v 1.1 2011/05/26 23:12:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild,v 1.2 2011/12/07 14:19:27 naota Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -22,8 +22,9 @@ RDEPEND=">=app-i18n/tomoe-0.6.0[python?]
 		dev-python/pygtk:2
 		dev-python/pygobject:2
 	)
-	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )"
+	gucharmap? ( gnome-extra/gucharmap:0 )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	dev-util/pkgconfig
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1.4 )"
@@ -39,6 +40,7 @@ pkg_setup() {
 src_prepare() {
 	# Fix compilation with gucharmap-2.24, bug #243160
 	epatch "${FILESDIR}/${P}-gucharmap2.patch"
+	epatch "${FILESDIR}/${P}-underlinking.patch"
 
 	eautoreconf
 }