gentoo resync : 14.07.2018

9 files changed, 324 insertions, 0 deletions

diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
new file mode 100644
index 000000000000..c2e577dde849
--- /dev/null
+++ b/app-text/glosung/Manifest
@@ -0,0 +1,10 @@
+AUX glosung-3.6.2-glib-includes.patch 329 BLAKE2B 79feae4ab17b1647b57807db8ff8346620548c9498a0329d97e76a6aacbeb7aae0e8cfc3d234717f24d715d310c14909c0d0ceeef6d8be4090be93e5386bc929 SHA512 cceb87873bb1b617f0d550d0d1818e21705c9894015a6c8bbd6050365af580956fcf6f79289cc0ac619552ec170af3f42f5222c5733548f7eb5d3fd303733044
+AUX glosung-3.6.2-scons-2.3.2-respectflags.patch 1701 BLAKE2B 7bd71dfacfee19d6466fd4462c6e918dba46f362fdf2bb300128b1f651fe6e777514cd3d1225f752a375371841fc86317f222894e7b33be415d04d9f0402277d SHA512 6b2dfabc97cc87280a8078accd5d39bbae47b3d03db9efc85b820da135c6231683916cdae3a00dcd662d3c74332322997579370bf7b539f15ea033786d4fbb70
+AUX glosung-3.6.2-scons-respectflags.patch 1720 BLAKE2B eb83fc529227215002bd8029e6870ce4d8c5aaef8170d36c3ad25fc4a583f0d8e764b869180590ff6fa13bd52ab728979867b0b71a2f34038493abb022ece480 SHA512 e2ab10f723fa30e9aec8f10fe629711228ee4d08076095fdf3879bc23da1f15fe991367272d55c5490f96255100a6024c96f639613f6a402b3112fb68ae29520
+AUX glosung-3.6.4-scons-respectflags.patch 1785 BLAKE2B e9580d582a76c43345b133bcae6f3ed339e55f02e2c2037d80dd08592b87efafb65e63ec5224036199597b0973abdd3bf374b1cb66a03dcf9663cbaee3a26526 SHA512 7cedc550a6cc3902c38deac26016facf1383c581d03b2cbc4fc484c0ba0cd332bba5496904325a09c8416595fa14c92b1db320f902fd1acaa515e1e8d4da4b8c
+AUX glosung.desktop 374 BLAKE2B aca6f33d8f89df4878cb2ffc313c1187f551bf4814bc174370c0cb028b8ec51fa22ff76b95dd1ecbda5bf2687cf6e63040c2968a4e3d540f1e472f51fc72be50 SHA512 3afccd76f801b61690eda4e7902aa3abe048a241dbbe31dc17670611d0463acbf5f54536d59f8b6da2d55423b62bdb0b16c30c241cca27b0774908e067d280a2
+DIST glosung-3.6.2.tar.bz2 65089 BLAKE2B 247cca9079c361316f3f3648667ffe18e9bd8c62c30d2944f07840ffca2972d9cedadfef7da6a05944c141351805cf170248729a10b577aad0846f75e8e09454 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11
+DIST glosung-3.6.4.tar.bz2 71887 BLAKE2B f5e2d2c54e4d66daf175961e78eadcd67dee04e0713e084de877068ea34cb63ff09f100195d1d902174c18b0842aaabb007dac4f67cd2d8d3ba7ecaacbd2c700 SHA512 c4f51d2569e0c74bddf6806551c314a337d573cd10ab1b6dc04c735c24e4e3e679af35b5d7340d7917e6f4c1fd2b4dec283205c5f744b8c020630ba428738349
+EBUILD glosung-3.6.2-r1.ebuild 1232 BLAKE2B e374c86fdc0e2ec8dce9b9bb28726722bab7ebdd35d2c354b15c0dfacefe811f445e16f0d587dcec8cd87d7547f00cf3acca181d9c99ad0b3031be8e90dbcff3 SHA512 5497faa310f62402217930b38b51cb4882abb839bac0f89403296c10604d2a5c5e6bc4cb800ad77c5facb1ae4454a49c4ff4a3a5dc2491842c16de27077babe8
+EBUILD glosung-3.6.4.ebuild 1040 BLAKE2B 1fe44bb3c3dc41aecd30dd769aa6c0bc1c30b7d4c9c2dfa3e51e7157600ed005b01cb6a035e3ea74fa48430ee83f03d355704ab7da67a36877417605fdb2d99e SHA512 d8250228f1941331ac9ff867affd2ea6a42041eeb03ba832dbeb0e63361955390503cb396e9dc031c5b21bd090e9f9d78dd95b97adc51ba151d782df73bef7ab
+MISC metadata.xml 297 BLAKE2B fc1d1b5292ad79937c9356f138153f5183994bc8a9a31d614d3540f91c07d8b6b64a251c53337ceeb7e42ed506822c2501f8d3bf43e7611d93e930b12839dd66 SHA512 4e9f59f67c171aa9fef3056f2231632fe454646bd45a1170d996f99ba5ab4ab08bc8194f7c1a345f405331dd5bd302d10e57379760eaf867dc69f200884dd8f8
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-3.6.2-scons-2.3.2-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
new file mode 100644
index 000000000000..0f4ac73a06bd
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
@@ -0,0 +1,63 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -17,6 +17,7 @@
+ 
+ 
+ import os
++import SCons.Util
+ 
+ version = '3.6.2'
+ 
+@@ -32,14 +33,22 @@
+                               (this option is only for packaging)''')
+ 
+ env = Environment (
+-  LINK      = 'gcc',
+-  CC        = 'gcc',
+   CPPPATH   = '',
+   LINKFLAGS = '',
+   CCFLAGS   = '',
+   ENV       = os.environ,
+   TARFLAGS  = '-c -j')
+ 
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+ if env['PLATFORM'] == 'win32':
+ 	prefix      = ARGUMENTS.get ('PREFIX', '')
+@@ -58,7 +68,7 @@
+ BuildDir ('build', 'src')
+ 
+ cpppath = ['#', '#build']
+-ccflags   = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
++ccflags   = ['-std=c99',
+ #		'-DLIBXML_STATIC',
+ 		'-DVERSION=\\"' + version + '\\"',
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+@@ -74,7 +74,7 @@
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+ 
+-linkflags = ['-Wl,--export-dynamic', '-L.']
++linkflags = []
+ #  -L/usr/lib'
+ #             `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
+
+@@ -83,9 +83,6 @@
+     ccflags.append   ('-pg', '-fprofile-arcs')
+     linkflags.append ('-pg', '-fprofile-arcs')
+ 
+-if env['PLATFORM'] != 'win32':
+-        linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+     ccflags   += [
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
new file mode 100644
index 000000000000..15c12bf94888
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
@@ -0,0 +1,64 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -17,6 +17,7 @@
+ 
+ 
+ import os
++import SCons.Util
+ 
+ version = '3.6.2'
+ 
+@@ -32,14 +33,23 @@
+                               (this option is only for packaging)''')
+ 
+ env = Environment (
+-  LINK      = 'gcc',
+-  CC        = 'gcc',
++  CC        = '',
+   CPPPATH   = '',
+   LINKFLAGS = '',
+   CCFLAGS   = '',
+   ENV       = os.environ,
+   TARFLAGS  = '-c -j')
+ 
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+ if env['PLATFORM'] == 'win32':
+ 	prefix      = ARGUMENTS.get ('PREFIX', '')
+@@ -58,7 +68,7 @@
+ BuildDir ('build', 'src')
+ 
+ cpppath = ['#', '#build']
+-ccflags   = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
++ccflags   = ['-std=c99',
+ #		'-DLIBXML_STATIC',
+ 		'-DVERSION=\\"' + version + '\\"',
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+@@ -74,7 +74,7 @@
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+ 
+-linkflags = ['-Wl,--export-dynamic', '-L.']
++linkflags = []
+ #  -L/usr/lib'
+ #             `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
+
+@@ -83,9 +83,6 @@
+     ccflags.append   ('-pg', '-fprofile-arcs')
+     linkflags.append ('-pg', '-fprofile-arcs')
+ 
+-if env['PLATFORM'] != 'win32':
+-        linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+     ccflags   += [
diff --git a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
new file mode 100644
index 000000000000..9adece925b19
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
@@ -0,0 +1,61 @@
+diff -ruN glosung-3.6.4-original/SConstruct glosung-3.6.4/SConstruct
+--- glosung-3.6.4-original/SConstruct	2016-01-22 22:11:00.785053522 -0500
++++ glosung-3.6.4/SConstruct	2016-01-22 22:14:04.434058592 -0500
+@@ -17,6 +17,7 @@
+ 
+ 
+ import os
++import SCons.Util
+ 
+ version = '3.6.4'
+ 
+@@ -32,14 +33,23 @@
+                               (this option is only for packaging)''')
+ 
+ env = Environment (
+-  LINK      = 'gcc',
+-  CC        = 'gcc',
+   CPPPATH   = '',
+   LINKFLAGS = '',
+   CCFLAGS   = '',
+   ENV       = os.environ,
+   TARFLAGS  = '-c -j')
+ 
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ if env['PLATFORM'] == 'win32':
+ 	prefix      = ARGUMENTS.get ('PREFIX', '')
+ 	install_dir = ARGUMENTS.get ('DESTDIR', '')
+@@ -57,21 +67,18 @@
+ VariantDir('build', 'src')
+ 
+ cpppath = ['#', '#build']
+-ccflags   = ['-O2', '-std=c99', '-Wall', '-g',
++ccflags   = ['-std=c99',
+ #		'-DLIBXML_STATIC',
+ 		'-DVERSION=\\"' + version + '\\"',
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+ 
+-linkflags = ['-L.']             
++linkflags = []             
+ 
+ if ARGUMENTS.get ('profile'):
+     ccflags.append   ('-pg', '-fprofile-arcs')
+     linkflags.append ('-pg', '-fprofile-arcs', '-Wl,--export-dynamic')
+ 
+-if env['PLATFORM'] != 'win32':
+-        linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+     ccflags   += [
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-r1.ebuild b/app-text/glosung/glosung-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..6bf0c06d72a6
--- /dev/null
+++ b/app-text/glosung/glosung-3.6.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+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"
+	if has_version '>=dev-util/scons-2.3.2'; then
+		epatch "${FILESDIR}/${PN}-3.6.2-scons-2.3.2-respectflags.patch"
+	else
+		epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch"
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	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"
+}
diff --git a/app-text/glosung/glosung-3.6.4.ebuild b/app-text/glosung/glosung-3.6.4.ebuild
new file mode 100644
index 000000000000..581b7533a9f3
--- /dev/null
+++ b/app-text/glosung/glosung-3.6.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+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=""
+
+PATCHES=("${FILESDIR}/${PN}-3.6.4-scons-respectflags.patch")
+
+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_compile() {
+	tc-export CC
+	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"
+}
diff --git a/app-text/glosung/metadata.xml b/app-text/glosung/metadata.xml
new file mode 100644
index 000000000000..88f24ae3103f
--- /dev/null
+++ b/app-text/glosung/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>theology@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">glosung</remote-id>
+	</upstream>
+</pkgmetadata>