Version bump. Add patch to fix build with modern glib, ship a .desktop file due to non-UTF-8 validation errors in the built in .desktop file. Fix dependencies.

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

5 files changed, 94 insertions, 4 deletions

diff --git a/app-text/glosung/ChangeLog b/app-text/glosung/ChangeLog
index 3c40e47b94c7..06a7b29cad2f 100644
--- a/app-text/glosung/ChangeLog
+++ b/app-text/glosung/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/glosung
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/ChangeLog,v 1.12 2012/05/04 03:33:17 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/ChangeLog,v 1.13 2013/01/21 20:23:46 creffett Exp $
+
+*glosung-3.6.2 (21 Jan 2013)
+
+  21 Jan 2013; Chris Reffett <creffett@gentoo.org>
+  +files/glosung-3.6.2-glib-includes.patch, +files/glosung.desktop,
+  +glosung-3.6.2.ebuild:
+  Version bump. Add patch to fix build with modern glib, ship a .desktop file
+  due to non-UTF-8 validation errors in the built in .desktop file. Fix
+  dependencies.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> glosung-2.1.3.ebuild,
   glosung-3.2.2.ebuild, glosung-3.4.2.ebuild, glosung-3.5.2.ebuild:
@@ -56,4 +65,3 @@
   Initial commit. This is a gnome2 program for displaying words from the
   Bible, different random ones every day. Thanks to Eicke Godehardt
   <eicke_godehardt@web.de> for this package.
-
diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
index d3ed6856b7f1..0425abba25fa 100644
--- a/app-text/glosung/Manifest
+++ b/app-text/glosung/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX glosung-3.6.2-glib-includes.patch 329 SHA256 c9cc1607fadc3a5ae4f2cc4147ceb97805618912e505ae1e12c949a2739f069f SHA512 cceb87873bb1b617f0d550d0d1818e21705c9894015a6c8bbd6050365af580956fcf6f79289cc0ac619552ec170af3f42f5222c5733548f7eb5d3fd303733044 WHIRLPOOL ccf5a804c91299a2fc0cd3a7e4f3b765c630cfe151872b00426a3a16f0d52d85a0800ce81e691f2a4942b86a7045ec1620812e3e3f28fa7e3d8c654769581601
+AUX glosung.desktop 374 SHA256 813df4d09c476b28b44af96e86b7e663fde1970e1ca1274f4f6d5a87c67d715f SHA512 3afccd76f801b61690eda4e7902aa3abe048a241dbbe31dc17670611d0463acbf5f54536d59f8b6da2d55423b62bdb0b16c30c241cca27b0774908e067d280a2 WHIRLPOOL 5160b172bd2fa81b615d117f17296a50f4f111ee17f86ecc31ec80601949381bfb5c7e1649c9d8c98fff84940887654ca586417c22b657b15ec51d14f35ef1db
 DIST glosung-2.1.3.tar.bz2 533021 SHA256 832ee4d2897069acecc03865490a8e2f098f414f31249f391791c5f80f26d0ee SHA512 b6129e832f0c42d9e4918dd8aefa524cb4b103de998e46cbc1b1776ea8339212b36ba0c43293cc6195c36c40be2671c33528c25b722e77e2c31b772a27a6a8f7 WHIRLPOOL 9c2dba16fce3efaad4663baf6657e0467f987596c43bf05de8f2b7b1d07d68aa6570832f4548f07d701f4ee8300635ea3be57bcf00b95aa61633727d31000309
 DIST glosung-3.2.2.tar.bz2 42510 SHA256 804347e777caee76adbe761918f7c60f280694b07e0266c33c37b076bd301d13 SHA512 45542ce5e8e833de8b1eea27d7d8d4443d8be478f499ea71014bfa63f2bda152a4ac57305a07dc5557295a9b91b5c90bb9299b5bdf12e4a764de4972288aebaf WHIRLPOOL 4afaa15b04919c97ace1887aa84ab1ee4d092653c853b09ea2d853519bf6e378147b078f89bf07abc5cee05905e370f51066db6eacfc26a2f1bd6459b6fdc963
 DIST glosung-3.4.2.tar.bz2 52114 SHA256 c9b421bf912f417852bf783fe700014e44e8d85102eaa7b32da8447187d41c40 SHA512 83f0e653f035c0155ec53b0fb99fc577dc940aace40989ea940dc876b00f3071f4378f88a08e16cf7180d5a1a0b402e7ea70c97296fc3f56e3ee7f54abd8df10 WHIRLPOOL 8c785db6a0c10c876ec5524c1342662aff24f6c89c524ceef01e6b96770fa07e8eacc52a5ccc36f8fb2d90996325f3c79d7dde5bafd2cd7ba42573bf09274fe6
 DIST glosung-3.5.2.tar.bz2 58794 SHA256 12aeec2a66cd158a600cfba1b8aa17ed4d30b137f65144bdea86b182918eeefc SHA512 de0734c9092f38c0bc5b94323978544ea8c404185393281b26c79aa8d932e19f36203536970b1c7386fdd5ada81ceee9019ff5da2bbeee39fbfda19141a063f8 WHIRLPOOL 67d2d1ab2110efb8990608752333907ea71151e57805cc3409094f74f296f5a477cd1149c1bc0b7d506142bbc2d3f3678f2797cc144622c43a9335b74d9bab5b
+DIST glosung-3.6.2.tar.bz2 65089 SHA256 5b46cd776b51ea3ace6ef901512c4100e79ce5225f7d7cf910b69d930b7df4c9 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11 WHIRLPOOL 91bb6e08f149430edb41b901072b5fe4993590f7ef173b99f313d857539e1be40dd00797b8623312da8a2909be7577d39b5804523e3b79bce00eccf919ee5a8c
 EBUILD glosung-2.1.3.ebuild 925 SHA256 3074b178af4e269ab4eefcaab87a6ddee45d48a4da8dc319c83dc2cdcafdaf79 SHA512 284bf47ef86b6d9dfe440d5641568909e04054cd88275df8952ee1917d7214dfaa115a3eef34b9b570d53c3344fcb0747b05615cf8fdf9014699f7d1340b6c5a WHIRLPOOL c1eb7dec1b81506acf637ea8e88905ed95d1bb44fe3d70c3aa0fa552e65171c3fd57216a63bd515cd22601d830053435bdcc7917b0a51f9b7ebfa93a8a7e8644
 EBUILD glosung-3.2.2.ebuild 852 SHA256 d206eb82307a48c97a9f403e66f0c68b5d357391aba034cb01117c83be8ed37a SHA512 3cb620c2c823fbfe013075fabd1abf57663e967c4879a6911333d8c56961b465f8be563838ec1c8eaa5ae09ec791c166abadad5c446bf62b89b727928de2cdfa WHIRLPOOL d0b1db1252926beeab26aa08c4a7a049b1c9ff51be9fece6498d7795a96630da89da52e131d47384fec077e58c1a99065bf1a43ee401f19ffb2b7f3245ef239e
 EBUILD glosung-3.4.2.ebuild 852 SHA256 96f195977c86a73b548b5a86f16395f3bd39358193eace543a884e62cd12d775 SHA512 3cc7a4eb34391ef65e2a807b25bee3e3d8ca20f7a5e1f506f7dafdda48fc8b9c980f7df9bdf2fb0df2bc3f408f5db06b78e41e36909d803f58a44eb5d1c41547 WHIRLPOOL 28d73b65b980bc567bc83514329ac6a958e64b32d396a6e9911e7a85e3cc2a756478e02c57e8a76511173f18ee35e3ff2107737e69b8500cd86973fa58cd61ff
 EBUILD glosung-3.5.2.ebuild 852 SHA256 f825d82ec758b8f04f976649d64a941ec5665425f74a1d305e9d29fd190f8aa8 SHA512 33da76e5f15faab8119d09373dcb7ba591f023e0c7969545d27cdddd12b1ed1ab6d5f5d0e366e04b49a88a2934136c04aba4c05c72dc0dd86912b5334e6fd606 WHIRLPOOL 6e58496413cae1d3278991e0f1cd9b88c20c120663404942f5ecd1e54cbf5ca236eb7e0863380196ddfefd91db84b74ddbc1059b2c2e089c4b180bca1c581577
-MISC ChangeLog 2056 SHA256 ff4bcc303a8e5c43ab3b50b740d3abbdbc6aba37e0395d28a144ad3142d58401 SHA512 721066b1311f545a6e5b2b97568024b2eb9efb047bf4d20005784576003b592bfb4f691452586cf778a16241aa747ac54456cf5025228c33d2503ea5e58ea774 WHIRLPOOL 86df7a90216a54ced2c6e72de7825bc5b0962b9ec529318a4c1dab44c4a88efef00189ac0109709b9967048a0ec0fcc972972a88999221da19415721193507c8
+EBUILD glosung-3.6.2.ebuild 1135 SHA256 2f4004c7626530bec1fd21d285e09b986227be967f69cb1b827157df10c34aa3 SHA512 00edb6aef175d53ab10d71e46fbbea5eb14e2e0605f994304ae54926286898c6bfbda1269e9904a84a85e9385bc53d988f339e289087bef1e8a3c2ed97fd2e1a WHIRLPOOL fc7e990497ca39cdede45c4a2350ea6b717cb8d9bd61d9dc144c7b90512dbaa957aadad7d438ba05e06b794de37579a6eb9250e77b84988c792f9cc50c884586
+MISC ChangeLog 2398 SHA256 66e61e45393d43efe6646d72321832b0a43fce3a2b94ad806fda3409e3be93aa SHA512 17ffd288efacf2c92bece2525ecf593db2daa9fc42e511ca19a202539bb49bc49628d2bc90602af45b46ee77be7e0f365ace5f4d87a1e2c6d64cb0d5026c774d WHIRLPOOL 27797b50f8463b6a623ac5b2264a202c4cb6fcfe2c37cf2e506903b6467671e5ebc8500a0dd60f801a955ae4519df5eb4e8660805c17677e126726c1f1dd6cac
 MISC metadata.xml 225 SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006 SHA512 0efdc8e3f294969b59f05f95a050f2874334161bb2a1cceff59d3aaa32bd27f3516d39afde9e4dfe5537fa067a6cc6fce72dcdc888bdc21befa3dcd2f8d60927 WHIRLPOOL d2f3aac6fe5898a13b42170dc3a248abf6d3668e74afb556e0c78baaabf45c2722c1dcad440d683899e984b5e6c0f6ed813de1aab3c7920890e5b9829d0ba3eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlD9o9gACgkQ23laikJhg1TzCgCfXmmMlejLWQvjIQGXNsxB7pSg
+0+sAn3LJ13dL5WiuXQXzIYQuC96EpOiq
+=hr8y
+-----END PGP SIGNATURE-----
diff --git a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch b/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
new file mode 100644
index 000000000000..715b201ca64f
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
@@ -0,0 +1,11 @@
+diff -ruN glosung-3.6.2/src/losung.c glosung-3.6.2-patched/src/losung.c
+--- glosung-3.6.2/src/losung.c	2010-01-04 15:28:38.000000000 -0500
++++ glosung-3.6.2-patched/src/losung.c	2013-01-21 14:34:14.318711560 -0500
+@@ -31,7 +31,6 @@
+ #endif /* WIN32 */
+ 
+ #include <glib/gi18n.h>
+-#include <glib/goption.h>
+ 
+ #include "util.h"
+ 
diff --git a/app-text/glosung/files/glosung.desktop b/app-text/glosung/files/glosung.desktop
new file mode 100644
index 000000000000..7372b0f47123
--- /dev/null
+++ b/app-text/glosung/files/glosung.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=GLosung - Herrnhut's Watchwords
+Name[de]=GLosung - Herrnhuter Losungen
+Name[hu]=GLosung - Herrnhuter-i Útmutató
+Comment=Gods Word for every day
+Comment[de]=Gottes Wort für jeden Tag
+Comment[hu]=Isten igéje minden napra
+Exec=glosung
+Icon=/usr/share/glosung/glosung.png
+Terminal=false
+Type=Application
+Categories=Utility;X-Red-Hat-Extra;Spirituality;
diff --git a/app-text/glosung/glosung-3.6.2.ebuild b/app-text/glosung/glosung-3.6.2.ebuild
new file mode 100644
index 000000000000..873937dfee6b
--- /dev/null
+++ b/app-text/glosung/glosung-3.6.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.6.2.ebuild,v 1.1 2013/01/21 20:23:46 creffett Exp $
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
+HOMEPAGE="http://www.godehardt.org/losung.html"
+SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxml2
+	>=gnome-base/gconf-2.0:2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	net-misc/curl
+	>=x11-libs/gtk+-2.10:2
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.93
+	>=dev-util/intltool-0.22
+	>=sys-devel/gettext-0.10
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.6.2-glib-includes.patch"
+}
+
+src_compile() {
+	scons ${MAKEOPTS} || die "scons make died"
+}
+
+src_install() {
+	scons install DESTDIR="${D}" || die "scons install died"
+	#Ships with an ISO-8859 encoded .desktop file, which causes validation to fail, so ship a UTF-8 version
+	cp "${FILESDIR}/glosung.desktop" "${D}/usr/share/applications"
+}