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.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 42 insertions, 8 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/Manifest b/app-i18n/libtomoe-gtk/Manifest
index 5cde9fcd58bb..cf1cbc92a599 100644
--- a/app-i18n/libtomoe-gtk/Manifest
+++ b/app-i18n/libtomoe-gtk/Manifest
@@ -2,16 +2,27 @@
 Hash: SHA256
 
 AUX libtomoe-gtk-0.6.0-gucharmap2.patch 8375 RMD160 d44640209180d1ed3b0959d7ba381ef352cfd52a SHA1 5bb74fba292091a7a781768e6d3061d0d79f03ec SHA256 b63818981ad1933448011f1f93d5d7b0d7f9ac272ffcf2fa206a07073f8dc69c
+AUX libtomoe-gtk-0.6.0-underlinking.patch 445 RMD160 f1e39b6c7c40faa1b71d26f551f52c2c025607c0 SHA1 13588f90753f5f524ed61f60f33cebd2391b9a16 SHA256 5b53aba70321f2f95307172bae879814a95f118f5f0cf18b4049f905b7574d1b
 DIST tomoe-gtk-0.6.0.tar.gz 448058 RMD160 72e0954b8994d1e62acb7d4cb0c478dadb54b8f0 SHA1 dddb1178c437380a92b59dbc273dafdd2045e1d1 SHA256 4e9b228e25451b1e875127a57eb40270e38c59cf4d46bc25c208e370d884ba64
 EBUILD libtomoe-gtk-0.6.0-r1.ebuild 1079 RMD160 c150fe9b5a4edf612a62f2943d5112776c70cdf4 SHA1 e89172c3f40a51da20f7b962582d6813d331431b SHA256 d85630db983ca2f58e96bd50427a44dd880b8dded140418b80a68f97a46cee36
-EBUILD libtomoe-gtk-0.6.0-r2.ebuild 1578 RMD160 e298c64f5df713f8b4a4f10f40c2efda9ff66ca5 SHA1 fac59149d3399646a43bee579cc7ebeb70344dfb SHA256 7038872529fa1dcaf8c6ef2c024848f286f7728ab3282873389e02991954d09b
+EBUILD libtomoe-gtk-0.6.0-r2.ebuild 1638 RMD160 934e03a1c21987a3a8e2aa56cefe97f6d7ebff6a SHA1 f037e6cc93f04dd95f3f1b5960ec39ac67df7739 SHA256 ac9d9d66d7314b4f5b54c6e921f29c9084668d91927f41b2c4180b86f8ada871
 EBUILD libtomoe-gtk-0.6.0.ebuild 857 RMD160 be0379ac55fd2661901bf1b9063336ef685d4bb6 SHA1 b5bc2dee068aa62b0e36987c1740b1db555761d1 SHA256 7c6e235e7f413353edc76d3b08cd0a3f467b9d803aab343c4c998c5f8c282241
-MISC ChangeLog 2576 RMD160 d7627017c88f86878561c96b67e9d638fc3b517c SHA1 2b8d75d006d798b5d930b7b24d8fee029b0e73a2 SHA256 c8305ffbc096c00594f8701cec16191006c83e0960ebfadc8ae662100ddb1876
+MISC ChangeLog 2888 RMD160 f8eed3676942bb9bac6e04a3df1efc5dab8c8a0d SHA1 74917d2fc31ec9fea31996312481613653dc7ffb SHA256 926678588c3f7c116ad126bc3d62fe6aca15f0a92b48a94dbdb81ef0cd10ca61
 MISC metadata.xml 236 RMD160 1cb61037b0cf761f4823da85befe9f91352af1f3 SHA1 1315236a62927ab9992425322fe761114f117ab5 SHA256 74c11e14aec9152565aeaf815c2af06db75d65f1da66d069317277eb2b8f9f11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6kjoUACgkQdjK8w9WeBnDTKwD/XDenF1GOXBVPqFTQZE9sxSXp
-2yNXWezwrwStKOvLodIA/iFsXiXQyDut/BNllA8kVuvXic1qSvnbLeCv/InKCaNg
-=XJKe
+iQIcBAEBCAAGBQJO33XuAAoJEDYO1FT4VRUUUMwP/jdc4qGfON35p6maLSazF3GV
+MpjXQTyy4LQBEcw24aam+zfK+26FNSS0+iMACBU9y7rjx12XEWLHBaosd6Mm7BTM
+39rfUc4ClSrXd9vMnlfNhBMRZzUarIXukPUA+NRPcADgVdDmO1BPffjGelwhybY1
+NMkEEKHq+dzn2Jk8wmfH+ZIZRyNeCajddTcOHqdOVed2kNZp/hjjnqEc/YGmH3Fv
+mT3L17QNpXIq8SqE0m0dOdPNTxvQTz/hdhtcbpcNMiVv6SgA0qyhnhe8U8u5Tq8a
+rKvt8N3sEcG9MSEyA47OOP74D4TeZzjpiLgwRwqP7mxhOB8ukYvFQ/X9v5pi+Yfs
+XhDOAbifFBbhXy4Ed8zq90t8Bab0oQzjcHd6nA+vXDTAYL2xt63Szk1tcoadIxW5
+07A7yvEV63q6tui/tSkZUGaCGcquiAAeJ2vEyM26hm7v+WeJcs5NlBvWBAx/62Y/
+fJm//vG4NxxsvwCZl8r1UKqJdyRQMOE5qPuoDY9n3aD21FgDlb09d+THe5LxKQHa
+Mc9d6HXjqvPAaYVVrg06d3HXxsEu4G9PeXdyr8hezNhjzsnN11i8SEYTplLZROnB
+OtFC4MDL3jpA9v2/dapNsFrR+Mf/j6rAchuoeUDm9Wwl8rdCN4jVthios2IhUpNj
+xdZiHyo/gwSXGWYz7TBh
+=caip
 -----END PGP SIGNATURE-----
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
 }