Add a patch to punt out obsolete gnome macro

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 47 insertions, 21 deletions

diff --git a/app-dicts/gjiten/ChangeLog b/app-dicts/gjiten/ChangeLog
index aba0eaad270d..336e9315ae17 100644
--- a/app-dicts/gjiten/ChangeLog
+++ b/app-dicts/gjiten/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/gjiten
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/ChangeLog,v 1.23 2012/10/12 23:55:24 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/ChangeLog,v 1.24 2014/07/08 00:41:15 naota Exp $
+
+  08 Jul 2014; Naohiro Aota <naota@gentoo.org>
+  +files/gjiten-2.6-drop-gnome.patch, gjiten-2.6-r2.ebuild:
+  Add a patch to punt out obsolete gnome macro
 
 *gjiten-2.6-r2 (12 Oct 2012)
 
diff --git a/app-dicts/gjiten/Manifest b/app-dicts/gjiten/Manifest
index 88c17f6f2c55..28950f06a924 100644
--- a/app-dicts/gjiten/Manifest
+++ b/app-dicts/gjiten/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gjiten-2.6-drop-gnome.patch 586 SHA256 892a4bd3df4b49bc55545b3931dab34189be2423105bf028150d52e84b461e02 SHA512 ff1ba9c9c2fed5febd4505766950f49a5489dd398ae0c90b88a44cf264cbcca6e5970015e2a1ea25267520f3e747ddaa26ae08c9cedd2b08b1734276beffed0d WHIRLPOOL dcefc0a57de0dffba81dda00e05e03790a03543d0aed5c8e03fd01a23fba01f5d93629cc4315648da89cfa4b75396559b6e5b2f72020ba2dd6a3a3e0631da265
 AUX gjiten-2.6-pref.patch 295 SHA256 31b78d6926209313c0111bf7355a252ec906ed3be2ff9021fb74625cce9f014b SHA512 6725cf64f2455a5894b5fe98ea9f8541b38763dc5cd25464e5142d2118c99647525903e3648ed5f6cd8eca5aa0489fe71577d6d427e79c6ebfe3ef7fa91748e8 WHIRLPOOL 1dd0b09368ffeb00fa41a30a197b499a7123f35b63c7098f1ec9b2dc9748ec6926702aa269e25870805a6eb575d0e24959415b6924cfdeb6868543a04e094503
 DIST gjiten-2.3.tar.gz 526530 SHA256 b3f30cd066869401c8432de4395a78a582d818920c0528a14de10861aabe0534 SHA512 8f2dbc8b3adafbce086f7311b89bafc68538f67562e7392693cdb4b20b2559fb2164629c3aa1ff9d040b21eb64a19ca6fbcbf683c5758f91b41d2b4e2b6f0da1 WHIRLPOOL 47342f2b2351d01e9c962c83466b6fd71e3f189962991854c7dcf2b9e62fbcb0d14a28face9e30c178fa7f035854459b5a3ac5f965611129bb2638e4a3946a06
 DIST gjiten-2.6.tar.gz 564845 SHA256 f6c0cc69e1e59ed8c3a946a1ee3e4a5e2e1deb16890bfc5f67c055adb10a71dd SHA512 ef56ad2fdcbe9c1b2df59dbb0cb4036ab2cf90e0fa290275b5dbfb0cfe66521231da48dc710a2837bd1d4402cf2bfb219b952a85e0a482062eade316c04e0bfa WHIRLPOOL 857a38294bc8860f9e8be2dd856ed111385a911c872d39f9c64e6c3cf953dd6662c043ef4679e5f956e6ddaed16f4fd3d02d0d5fd45ac1d318ef68a802aee9eb
 EBUILD gjiten-2.3.ebuild 1399 SHA256 9f4839d96655b5f1d87cde7e9e9c74f5884a49da5d717de63d7d92ccf403fc5e SHA512 dd19537b3bc281e339074c1d75ada7b5cc931e045018be70eb59b5b3c2bae27cde5055c3e7ab573e42492b4398b6b8d5ada312b684f0b759277109591eb0d078 WHIRLPOOL cbb290b7d3345e3ee09d0a7672a6750cc8e98bdfb782adf217516b2dee0e90c07486a8b0d0e7b4855ea7ed2bce3c43f99511a97f21fb45d6965875144115dd99
 EBUILD gjiten-2.6-r1.ebuild 1552 SHA256 cb75a3722b1ec2d470fb680d9ff82700673e9dd939fd3b576df37922b88e52ac SHA512 b0d6175e6fb1a4cceca88dd5e05b43b7b3821e27419329822675ebe0ab1b6affc514874729e40f5e1dbd803543664c255a7576483f47712a864a7dcd8c3a915a WHIRLPOOL 3480ca87db7f6cf0f57a3b27efd5d4647439b2b7f6d17c7c1424930438b3057afafbc49dfe9247bb5862e171e6a99d930b709d1e6174de5f9be039106561c799
-EBUILD gjiten-2.6-r2.ebuild 1589 SHA256 dbba82bdd17cf9a5c4143fed2a8dd8a9d88ec074c81f4e4494c535e6525f1a52 SHA512 386bcead1e5c0880c4a4112a8beed8b9288ba7f170675e3d0ead7fb5da8ab7fa62376070fb6445d5e5416b508ff10f625e42ae549fcd2d75558813afa3e04f39 WHIRLPOOL d6ba31ae942dc0030a693e72c4077b66aa9c1c7886c13c771e17099da628b0cffe98b54b9319de6b7f9a08cbd67f0a8c78666af30050cda4f0ec68bb0e5786ee
-MISC ChangeLog 3118 SHA256 151c4f16df2458d1e1096410a5be1a17fd61eb70a9e13b023cac1a6c5bd1e712 SHA512 e23d34731cb92dec8c30e4406a2e1ab7a344c89b0c60488ecdba8fde9ec71d8fca2ed88a9a5ed5a4507b0238ca2f138f90ed57eb694c617a69bdc4adf1ef97a6 WHIRLPOOL d182c073604b9de62ae5a19eb45ea843443cd4d405ac42c9e393205d9018e31fe0b146f392222da1f530014263167d8181d24affd21528a472d12967b1fb848b
+EBUILD gjiten-2.6-r2.ebuild 1629 SHA256 8a369a1d09560c9e8db5a5ecedf5843b6535255a90632eb374e6768f4c870f78 SHA512 91ad7e61ba38ab002a91dd7c6375ee7ba809f0f26899ca9c2f4931652711833f62c3c774b36566aa0ff3474b0f7eb379007aa228f6f275d36604cc93aad76985 WHIRLPOOL ceced6674c26eb5d6fe13bfe477444d6d68243b6981a814814502931e4c10930bc6c15bd81a1152547ab71fb6fd9b10467538df91d5a8b6e083574b5669d23b2
+MISC ChangeLog 3273 SHA256 2119a0d5784e6b589009a1f0ec3b989e1657892da6c1ac0e8f87f7177925ea39 SHA512 53183c35a3ac140d35efbe0a6d767d314cb2b1a6b4ac0521d0f1348819e9928eada35150db90d7b4f222d9087efc083c9d9449272bfbc85547a6565f209edaa6 WHIRLPOOL 8016d9bddbed4cfbbe4a678dc5264f6f3eb76eb88d9f3335c5ed7f47d0715df56b81e8c71d47a97b2d907921866562e91c095a5f66832d9994073ed452510d85
 MISC metadata.xml 378 SHA256 6704ee5210709c9bc43d9957f857da009c85a81c3344e33d075a94d26be11fd7 SHA512 a9392361da3e137b48bfc4807b8dcb8a85cf8416ecdf698acba3a215437acf3ed413b1a898608025ef4a843b0d8aa96f42b6a5ce7a029c7731223c10485c8eff WHIRLPOOL 1aa52785ce94bcff5b572f55b5d91f4e195d5f7d0683d8843e329551cfd55cecba166590c631cf1690cd8da646332063e9f65aad08447fa1a08c7402f7b27776
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJQeK30AAoJEDYO1FT4VRUUlBQP/A+g2WcMRTKBiUl20vHoL4qw
-A2EJxk93dExRz/LQw6SJ3lc2WmEI9MNMuk8A5fDMo73IPTT4X76PX3NZ8esI26uU
-BvhS3TNKn8xt3HnE/0lbDncvvRqbCkE7rg5bi2zz12OPfP5E40nOulVzlTn637xT
-howeToo6jWY020Dm2fhZtOklBldF0UsYaaufEQ3ujPJxowPaGS+gMhD6TKPiAVF8
-rr0HvX1p/P+kQNhLWpiWzD2NeyqJytweiQdEstSmxCtUyAD8xsPtugaViT3SvWcJ
-mnOysyLYjAYI+rmwVP81yJ77iIOI6Rrly7ssLsAqJ1k4J6KaRJSjX6Ud7/P5nynJ
-LgpTcZ17fcXOi/FYHyhwBU0rJnRefoam0IFWsN42akYp6rtb9WgtLN7pYYXCgPj8
-iRmxllr47KBTVzWI7Jdh4yNFyHfCWYIVi/gPCt3HHSraQVM+1+2OmMLF9y4NRAR9
-LRpc/XqEmiRMQ6M8f6XcWcqSsY93BzWjxTVYGyuu2t28kyJzVU1jkLpOCNwIIQDF
-yZDTc2UptItzInwjCyG/0ftW2O2xK9cy+vmcLv+6R7fXct6F1xI+0zPZXThtXkmV
-0IbbOZJYzYp8Nw1Xx7cMVqOYhpzhY9SIGzZC4B6jFfA2qpEzgCyN1We5q98wa8ai
-5cBjwNNLqPaLwxC0SwH9
-=nVVX
+iQIcBAEBCAAGBQJTuz4yAAoJEDYO1FT4VRUUD9sQAIh0FlebWC4k8sKwm76X7+e+
+jk0uNvs5z+hSi690+EJo/V12tNkfwHrSQMz8064bgoqSREEW+f3fhVmkuL+0gnbc
+ErwRACLXp7RqZoqlxi2+7m08VKbdEQWT2idfX2ntKckQcZ/SRwEUTMhk1cN3oOpK
+5DpFgp4Yy7a5JjQfNHBt9nAgjimrD+VbtR/cb6M+CYyRMSIdt+bsV6+rQYLDPHId
+zgKeRorHmX0+fPgfovVIZfW4D6+AItsZLhGWYy7vp9v9Y0k35wFpAsJWJx7fto8+
+ClqSNkR2ou3c4BCksNuEijrIwuS5lgbDarNDM9xFFO/Zwwt7Q64ptSMyJCZx0RXd
+l/WI9pNuQyGNCzhUvL2hW4kAyTco+t599ruc8Fss0zlSFp8qRaWgg2gs/xldzEN1
+XRg4jaRRPjX9b7ewH0C6qQYLME1O3dt2juX9lNTldFnvDDtrTDCyHF4Ussz8Z5nk
+inPreCKgH3LdHRvMEzx6TzBbSOzw+dHZ5yP6JqLkN4NAZCY/OxTetrHUzEWIPZ2t
+Nu6TO6NdAdL1IP3hKPaJjhWxu0Rru9Xa2qH5q0J1DcUyZAHd0IVmcUYSgfZml8wG
+T0jSm1zW1DEKy8g93oHCrh4yKh42nHQbONCNQFPglVz++KtWwyv+zJNAQHL2TGuA
+RQiiPPbNOALXxjEBccXN
+=nub2
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/gjiten/files/gjiten-2.6-drop-gnome.patch b/app-dicts/gjiten/files/gjiten-2.6-drop-gnome.patch
new file mode 100644
index 000000000000..7f0c0ed3fb21
--- /dev/null
+++ b/app-dicts/gjiten/files/gjiten-2.6-drop-gnome.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.in b/configure.in
+index aec96d4..733eee6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -18,7 +18,6 @@ AC_PROG_MAKE_SET
+ AC_PROG_INTLTOOL([0.22])
+ AC_PATH_PROG([GCONFTOOL], [gconftool-2])
+ 
+-GNOME_COMMON_INIT
+ dnl GNOME_PLATFORM_GNOME_2(yes, force)
+ PKG_CHECK_MODULES(GJITEN, libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 gconf-2.0)
+ AM_GCONF_SOURCE_2
+@@ -36,7 +35,6 @@ AC_FUNC_MMAP
+ AC_FUNC_STAT
+ AC_CHECK_FUNCS([getcwd putenv setlocale strerror strrchr strstr munmap])
+ 
+-GNOME_COMPILE_WARNINGS(maximum)
+ 
+ # Gettext stuff
+ GETTEXT_PACKAGE=gjiten
diff --git a/app-dicts/gjiten/gjiten-2.6-r2.ebuild b/app-dicts/gjiten/gjiten-2.6-r2.ebuild
index aefa32251e53..26c9d5411710 100644
--- a/app-dicts/gjiten/gjiten-2.6-r2.ebuild
+++ b/app-dicts/gjiten/gjiten-2.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.6-r2.ebuild,v 1.1 2012/10/12 23:55:24 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.6-r2.ebuild,v 1.2 2014/07/08 00:41:15 naota Exp $
 
 EAPI=2
 inherit autotools eutils gnome2
@@ -30,7 +30,8 @@ DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
 
 src_prepare() {
 	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-pref.patch
+	epatch "${FILESDIR}"/${P}-pref.patch \
+		"${FILESDIR}"/${P}-drop-gnome.patch
 	# bug #124631
 	intltoolize --copy --automake --force || die "intltoolize failed"
 	AM_OPTS="--foreign" eautoreconf