Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/files/, sci-chemistry/gelemental/
Date: Fri, 01 May 2020 17:58:08
Message-Id: 1588355872.a5e7c232279af1aaafaced70cfb7a6d0b51b99db.tamiko@gentoo
1 commit: a5e7c232279af1aaafaced70cfb7a6d0b51b99db
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 1 17:51:39 2020 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 17:57:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e7c232
7
8 sci-chemistry/gelemental: drop old
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
12
13 sci-chemistry/gelemental/Manifest | 2 -
14 .../files/gelemental-1.2.0-doxygen.patch | 30 ----------
15 .../files/gelemental-1.2.0-fix-c++14.patch | 14 -----
16 .../gelemental/files/gelemental-1.2.0-gcc4.3.patch | 12 ----
17 .../files/gelemental-1.2.0-glib-2.32.patch | 46 ---------------
18 .../gelemental/gelemental-1.2.0-r1.ebuild | 65 ----------------------
19 6 files changed, 169 deletions(-)
20
21 diff --git a/sci-chemistry/gelemental/Manifest b/sci-chemistry/gelemental/Manifest
22 index 988825456b9..08477ae3060 100644
23 --- a/sci-chemistry/gelemental/Manifest
24 +++ b/sci-chemistry/gelemental/Manifest
25 @@ -1,3 +1 @@
26 -DIST gelemental-1.2.0.tar.bz2 460757 BLAKE2B 53fd40cdc37909495cd9051c83418ace482fdf17930df2a94d8cb7f44a8eff2a5e7c37e54dac4e72810b1420d0bf2722eca47eb8c375fc05ecf26b753beb4e9d SHA512 2e6ef2c22b389cff69728b01e1eb397578974362356f5132098f29a9e01a64be228a24686738bd84ea575cee5aef068d9ab3d6c20233f995ccc5f1a1cb5d5673
27 DIST gelemental-2.0.0.tar.gz 779052 BLAKE2B 86f98a97acaf84c2bd6e03e991e226f19e65ed9c06fc43c809278d5e6d8b93645aa64ac4983166fad6b6b9b3d0ad5bba7a7cbfe2dccbbe2ea093deaaa8bdfabd SHA512 86b0f59a3508560e3882f40b820d7b24b780bb4d1619df94f3410b0832255deec8e55d11c5ad960f96fc3e16d8a624279bf53bf178bf1dacdfe80a72181e48d6
28 -DIST gelemental_1.2.0-8.debian.tar.gz 29877 BLAKE2B a19c853cd426e1abdf73b48a21d1d7c830a613dc5802b1478d699d21b3211060b150c25bd525414147d02972dd9ac0940468a2f873aad03f9b7c522e862f29a7 SHA512 83c236e3b91af304c96f28c0f12577821ee2f47c9e01fb1f3664228afb002dc19b1a71e6dcd6040d09ea991d131b147ea5b36283d8ead290d50014c15e69878c
29
30 diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch
31 deleted file mode 100644
32 index 8c904e84458..00000000000
33 --- a/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch
34 +++ /dev/null
35 @@ -1,30 +0,0 @@
36 -Author: Joachim Reichel <reichel@××××××.org>
37 -Description: Skip installing (no longer generated) .dot and .gif files
38 -Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590382#15
39 -Bug-Debian: http://bugs.debian.org/590382
40 -Reviewed-By: Michael Banck <mbanck@××××××.org>
41 -Forwarded: no
42 -Last-Update: 2010-09-22
43 -
44 ---- a/docs/api/Makefile.am
45 -+++ b/docs/api/Makefile.am
46 -@@ -12,7 +12,7 @@
47 - install-api: $(srcdir)/html/index.html
48 - @$(NORMAL_INSTALL)
49 - $(mkinstalldirs) $(DESTDIR)/$(apidir)
50 -- @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot ; do \
51 -+ @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png ; do \
52 - f="`echo $$p | sed -e 's|^.*/||'`"; \
53 - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f"; \
54 - $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f; \
55 ---- a/docs/api/Makefile.in
56 -+++ b/docs/api/Makefile.in
57 -@@ -393,7 +393,7 @@
58 - install-api: $(srcdir)/html/index.html
59 - @$(NORMAL_INSTALL)
60 - $(mkinstalldirs) $(DESTDIR)/$(apidir)
61 -- @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot ; do \
62 -+ @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png ; do \
63 - f="`echo $$p | sed -e 's|^.*/||'`"; \
64 - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f"; \
65 - $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f; \
66
67 diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
68 deleted file mode 100644
69 index 0965fe15b43..00000000000
70 --- a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
71 +++ /dev/null
72 @@ -1,14 +0,0 @@
73 -Fix building with C++14, which errors out due to bool -> T* conversions
74 -See also: https://bugs.gentoo.org/show_bug.cgi?id=593994
75 -
76 ---- a/src/dialogs.cc
77 -+++ b/src/dialogs.cc
78 -@@ -255,7 +255,7 @@
79 - const Gtk::TreePath& tpath, bool)
80 - {
81 - Gtk::TreeIter iter = store->get_iter (tpath);
82 -- return iter ? iter->get_value (cols.property) : false;
83 -+ return iter ? iter->get_value (cols.property) : NULL;
84 - }
85 -
86 -
87
88 diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch
89 deleted file mode 100644
90 index 8e69e98a543..00000000000
91 --- a/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch
92 +++ /dev/null
93 @@ -1,12 +0,0 @@
94 -diff -Naru gelemental-1.2.0/libelemental/value.tcc gelemental-1.2.0.new/libelemental/value.tcc
95 ---- gelemental-1.2.0/libelemental/value.tcc 2007-09-25 01:10:16.000000000 -0400
96 -+++ gelemental-1.2.0.new/libelemental/value.tcc 2008-10-19 10:08:35.000000000 -0400
97 -@@ -26,6 +26,8 @@
98 - #error "value.tcc must be included from value.hh."
99 - #endif
100 -
101 -+#include <limits>
102 -+
103 - namespace Elemental {
104 -
105 -
106
107 diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
108 deleted file mode 100644
109 index eab2ad1f194..00000000000
110 --- a/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
111 +++ /dev/null
112 @@ -1,46 +0,0 @@
113 - libelemental/misc/extras.cc | 2 +-
114 - libelemental/misc/widgets.cc | 2 +-
115 - src/main.cc | 4 ++--
116 - 3 files changed, 4 insertions(+), 4 deletions(-)
117 -
118 -diff --git a/libelemental/misc/extras.cc b/libelemental/misc/extras.cc
119 -index a8e5720..c042604 100644
120 ---- a/libelemental/misc/extras.cc
121 -+++ b/libelemental/misc/extras.cc
122 -@@ -21,7 +21,7 @@
123 -
124 - #include <algorithm>
125 - #include <stdexcept>
126 --#include <glib/gmem.h>
127 -+#include <glib.h>
128 - #include <glibmm/utility.h>
129 -
130 - namespace misc {
131 -diff --git a/libelemental/misc/widgets.cc b/libelemental/misc/widgets.cc
132 -index 002310c..941d881 100644
133 ---- a/libelemental/misc/widgets.cc
134 -+++ b/libelemental/misc/widgets.cc
135 -@@ -20,7 +20,7 @@
136 - #include "macros.hh"
137 - #include "widgets.hh"
138 -
139 --#include <glib/gmessages.h>
140 -+#include <glib.h>
141 - #include <gtkmm/alignment.h>
142 - #include <gtkmm/image.h>
143 - #include <gtkmm/label.h>
144 -diff --git a/src/main.cc b/src/main.cc
145 -index 41cfe03..68bbb4c 100644
146 ---- a/src/main.cc
147 -+++ b/src/main.cc
148 -@@ -26,8 +26,8 @@
149 - #include <clocale>
150 - #include <iostream>
151 - #include <locale>
152 --#include <glib/goption.h>
153 --#include <glib/gutils.h>
154 -+#include <glib.h>
155 -+#include <glib.h>
156 - #include <glibmm/optionentry.h>
157 - #include <gtk/gtkaboutdialog.h>
158 - #include <gtk/gtkversion.h>
159
160 diff --git a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
161 deleted file mode 100644
162 index 27588692bfb..00000000000
163 --- a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
164 +++ /dev/null
165 @@ -1,65 +0,0 @@
166 -# Copyright 1999-2019 Gentoo Authors
167 -# Distributed under the terms of the GNU General Public License v2
168 -
169 -EAPI=5
170 -
171 -inherit autotools-utils fdo-mime flag-o-matic gnome2-utils eutils
172 -
173 -DESCRIPTION="Periodic table viewer with detailed information on the chemical elements"
174 -HOMEPAGE="https://github.com/ginggs/gelemental/"
175 -SRC_URI="
176 - http://www.kdau.com/files/${P}.tar.bz2
177 - mirror://debian/pool/main/g/${PN}/${PN}_${PV}-8.debian.tar.gz"
178 -
179 -LICENSE="GPL-3 MIT"
180 -SLOT="0"
181 -KEYWORDS="amd64 x86"
182 -IUSE="doc static-libs"
183 -
184 -RDEPEND="
185 - dev-cpp/gtkmm:2.4
186 - dev-cpp/glibmm:2"
187 -DEPEND="${RDEPEND}
188 - virtual/pkgconfig
189 - sys-devel/gettext
190 - dev-util/intltool
191 - doc? ( app-doc/doxygen )"
192 -
193 -PATCHES=(
194 - "${FILESDIR}"/${P}-gcc4.3.patch
195 - "${FILESDIR}"/${P}-glib-2.32.patch
196 - "${FILESDIR}"/${P}-doxygen.patch
197 - "${WORKDIR}"/debian/patches/579183_adjust_size_middle_button.patch
198 - "${WORKDIR}"/debian/patches/604612_fix_menu_category.patch
199 - "${WORKDIR}"/debian/patches/604618_scrollable_properties_dialog.patch
200 - "${WORKDIR}"/debian/patches/656372_element_renames.patch
201 - "${WORKDIR}"/debian/patches/add_new_wave_theme.patch
202 - "${WORKDIR}"/debian/patches/czech_translation_559028.patch
203 - "${WORKDIR}"/debian/patches/fix_gtkmm_2.18.patch
204 - "${WORKDIR}"/debian/patches/fix_zinc_german_translation.patch
205 - "${WORKDIR}"/debian/patches/ftbfs_missing_limits.patch
206 - "${WORKDIR}"/debian/patches/lp673285_link_in_about.patch
207 - "${FILESDIR}"/${PN}-1.2.0-fix-c++14.patch
208 - )
209 -
210 -AUTOTOOLS_IN_SOURCE_BUILD=1
211 -
212 -src_configure() {
213 - append-cxxflags -std=c++11 #566450
214 - local myeconfargs=( $(use_enable doc api-docs) )
215 - autotools-utils_src_configure
216 -}
217 -
218 -src_install() {
219 - autotools-utils_src_install apidir="/usr/share/doc/${PF}/html"
220 -}
221 -
222 -pkg_postinst() {
223 - gnome2_icon_cache_update
224 - fdo-mime_desktop_database_update
225 -}
226 -
227 -pkg_postrm() {
228 - gnome2_icon_cache_update
229 - fdo-mime_desktop_database_update
230 -}