commit: 1a89808d24d6e420debad052fbfd1521148db238 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Aug 14 09:47:22 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Aug 14 09:47:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a89808d
app-text/glosung: Remove last-rited package Closes: https://bugs.gentoo.org/726818 Closes: https://bugs.gentoo.org/685576 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-text/glosung/Manifest | 2 - .../files/glosung-3.6.2-glib-includes.patch | 11 ---- .../glosung-3.6.2-scons-2.3.2-respectflags.patch | 63 --------------------- .../files/glosung-3.6.2-scons-respectflags.patch | 64 ---------------------- .../files/glosung-3.6.4-scons-respectflags.patch | 61 --------------------- app-text/glosung/files/glosung.desktop | 12 ---- app-text/glosung/glosung-3.6.2-r1.ebuild | 50 ----------------- app-text/glosung/glosung-3.6.4.ebuild | 43 --------------- app-text/glosung/metadata.xml | 11 ---- profiles/package.mask | 5 -- 10 files changed, 322 deletions(-) diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest deleted file mode 100644 index ae1288678f5..00000000000 --- a/app-text/glosung/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST glosung-3.6.2.tar.bz2 65089 BLAKE2B 247cca9079c361316f3f3648667ffe18e9bd8c62c30d2944f07840ffca2972d9cedadfef7da6a05944c141351805cf170248729a10b577aad0846f75e8e09454 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11 -DIST glosung-3.6.4.tar.bz2 71887 BLAKE2B f5e2d2c54e4d66daf175961e78eadcd67dee04e0713e084de877068ea34cb63ff09f100195d1d902174c18b0842aaabb007dac4f67cd2d8d3ba7ecaacbd2c700 SHA512 c4f51d2569e0c74bddf6806551c314a337d573cd10ab1b6dc04c735c24e4e3e679af35b5d7340d7917e6f4c1fd2b4dec283205c5f744b8c020630ba428738349 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 deleted file mode 100644 index 715b201ca64..00000000000 --- a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 0f4ac73a06b..00000000000 --- a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- 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 deleted file mode 100644 index 15c12bf9488..00000000000 --- a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- 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 deleted file mode 100644 index 9adece925b1..00000000000 --- a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index 7372b0f4712..00000000000 --- a/app-text/glosung/files/glosung.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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 deleted file mode 100644 index 6bf0c06d72a..00000000000 --- a/app-text/glosung/glosung-3.6.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 deleted file mode 100644 index 581b7533a9f..00000000000 --- a/app-text/glosung/glosung-3.6.4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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 deleted file mode 100644 index 899af0929d4..00000000000 --- a/app-text/glosung/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Marek Szuba</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">glosung</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 74a56dd5174..8aa78eee1fe 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -590,11 +590,6 @@ dev-ruby/zeitwerk:1 # Unmaintained upstream and broken by ECM 5.72.0, masked for removal in 30 days. media-video/plasma-mediacenter -# Andreas Sturmlechner <[email protected]> (2020-07-15) -# Broken by scons-python3 for >1 year, depends on dead gnome-base/libgnomeui, -# bugs #685576, #726818, no reverse dependencies. Removal in 30 days. -app-text/glosung - # Andreas K. Hüttel <[email protected]> (2020-07-15) # In preparation; do not use yet. =dev-lang/perl-5.32*
