Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/
Date: Fri, 02 Jun 2017 08:43:39
Message-Id: 1496392083.b234892011f616a6f8aad52fb2600b79f9723994.pacho@gentoo
1 commit: b234892011f616a6f8aad52fb2600b79f9723994
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 2 08:28:03 2017 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 2 08:28:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2348920
7
8 app-misc/gramps: Drop old version needing vulnerable webkit-gtk version
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 app-misc/gramps/Manifest | 1 -
13 .../gramps/files/gramps-3.4.0-use_bsddb3.patch | 11 ----
14 .../files/gramps-4.2.4-versioned_doc_dir.patch | 15 -----
15 app-misc/gramps/gramps-3.4.5-r1.ebuild | 75 ----------------------
16 app-misc/gramps/metadata.xml | 2 -
17 5 files changed, 104 deletions(-)
18
19 diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
20 index cc81765024d..4a55d6920c4 100644
21 --- a/app-misc/gramps/Manifest
22 +++ b/app-misc/gramps/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST gramps-3.4.5.tar.gz 10444188 SHA256 940b665a2e0dadf7ee310bdd1a1033c20816c856df8a7d6c4e0850a60471dbc7 SHA512 c9b517f58712d9f585dbddcb394d3605a5f823950a8c3c5a4ffd20d1a8523d6b75f9b6193271adabe76edc073dd6b4c20811de62582a2930b84d88922b4e52b3 WHIRLPOOL 4e30108881900883a4cb3c3ee4c9ef78e04d0850c3dbdaf97569f44cdfb2e56463f3f156f041b4dec6650c722f12cc0909689edc9591c97c5b02b1705860c228
25 DIST gramps-4.2.4.tar.gz 18683901 SHA256 25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499 WHIRLPOOL ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0
26 DIST gramps-4.2.5.tar.gz 18694912 SHA256 1de3007215b7d0b779ec8f086e14e7a75f2aa811ee37c6d0cff06bfc9458743d SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c WHIRLPOOL d9f49b188e20697477860ecb5916c452b95ea08c038b828b0f01edc1097d3d45b549e3e1a5bc5a4aad1d8aab390b8dfefc4ec46ac58420161de8e4d644c8f95e
27
28 diff --git a/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch b/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch
29 deleted file mode 100644
30 index 133c4edfd06..00000000000
31 --- a/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch
32 +++ /dev/null
33 @@ -1,11 +0,0 @@
34 ---- a/src/config.py 2012-06-02 07:05:21.479670747 +0200
35 -+++ b/src/config.py 2012-06-02 07:05:58.444713800 +0200
36 -@@ -302,7 +302,7 @@
37 - register('preferences.use-last-view', True)
38 - register('preferences.last-view', '')
39 - register('preferences.last-views', [])
40 --register('preferences.use-bsddb3', False)
41 -+register('preferences.use-bsddb3', True)
42 - register('preferences.family-relation-type', 3) # UNKNOWN
43 -
44 - register('researcher.researcher-addr', '')
45
46 diff --git a/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch b/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch
47 deleted file mode 100644
48 index 3d1ea8cb87c..00000000000
49 --- a/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch
50 +++ /dev/null
51 @@ -1,15 +0,0 @@
52 ---- a/setup.py 2016-09-04 14:44:02.000000000 +0000
53 -+++ b/setup.py 2016-09-22 13:08:33.188167127 +0000
54 -@@ -436,9 +436,9 @@
55 - CSS_FILES = glob.glob(os.path.join('data', 'css', '*.css'))
56 - SWANKY_PURSE = glob.glob(os.path.join('data', 'css', 'swanky-purse', '*.css'))
57 - SWANKY_IMG = glob.glob(os.path.join('data', 'css', 'swanky-purse', 'images', '*.png'))
58 --data_files_core.append(('share/doc/gramps', DOC_FILES))
59 --data_files_core.append(('share/doc/gramps/example/gedcom', GEDCOM_FILES))
60 --data_files_core.append(('share/doc/gramps/example/gramps', GRAMPS_FILES))
61 -+data_files_core.append(('share/doc/gramps-' + VERSION, DOC_FILES))
62 -+data_files_core.append(('share/doc/gramps-' + VERSION + '/example/gedcom', GEDCOM_FILES))
63 -+data_files_core.append(('share/doc/gramps-' + VERSION + '/example/gramps', GRAMPS_FILES))
64 - data_files_core.append(('share/gramps/images/webstuff', IMAGE_WEB))
65 - data_files_core.append(('share/gramps/css', CSS_FILES))
66 - data_files_core.append(('share/gramps/css/swanky-purse', SWANKY_PURSE))
67
68 diff --git a/app-misc/gramps/gramps-3.4.5-r1.ebuild b/app-misc/gramps/gramps-3.4.5-r1.ebuild
69 deleted file mode 100644
70 index 299a7a4af63..00000000000
71 --- a/app-misc/gramps/gramps-3.4.5-r1.ebuild
72 +++ /dev/null
73 @@ -1,75 +0,0 @@
74 -# Copyright 1999-2015 Gentoo Foundation
75 -# Distributed under the terms of the GNU General Public License v2
76 -
77 -EAPI=5
78 -PYTHON_COMPAT=( python2_7 )
79 -GCONF_DEBUG="no"
80 -
81 -inherit eutils gnome2 python-single-r1
82 -
83 -DESCRIPTION="Genealogical Research and Analysis Management Programming System"
84 -HOMEPAGE="http://www.gramps-project.org/"
85 -SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
86 -
87 -LICENSE="GPL-2"
88 -SLOT="0"
89 -KEYWORDS="amd64 ppc x86"
90 -
91 -IUSE="gnome reports spell webkit"
92 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
93 -
94 -RDEPEND="${PYTHON_DEPS}
95 - dev-python/bsddb3[${PYTHON_USEDEP}]
96 - >=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}]
97 - dev-python/pygoocanvas[${PYTHON_USEDEP}]
98 - x11-misc/xdg-utils
99 - gnome-base/librsvg:2
100 - gnome? (
101 - dev-python/libgnome-python[${PYTHON_USEDEP}]
102 - dev-python/gconf-python[${PYTHON_USEDEP}] )
103 - spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
104 - reports? ( media-gfx/graphviz )
105 - webkit? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] )
106 -"
107 -DEPEND="${RDEPEND}
108 - dev-util/intltool
109 - sys-devel/gettext
110 - virtual/libiconv
111 - virtual/pkgconfig
112 -"
113 -
114 -src_prepare() {
115 - epatch "${FILESDIR}/${PN}-3.4.0-use_bsddb3.patch"
116 -
117 - # Fix install path, bug 423315 for example
118 - einfo "Fix installation path"
119 - find . -iname 'Makefile.in' | xargs \
120 - sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
121 - || die
122 - find . -iname 'Makefile.in' | xargs \
123 - sed "s;\(pkgpythondir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
124 - || die
125 -
126 - sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
127 - -i src/Makefile.in || die
128 -
129 - sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
130 - -i src/docgen/Makefile.in || die
131 -
132 - einfo "Fix wrapper script"
133 - sed "s;@datadir@;$(python_get_sitedir);" \
134 - -i gramps.sh.in || die
135 -
136 - einfo "Fix icon location"
137 - sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
138 -
139 - python_fix_shebang .
140 -
141 - gnome2_src_prepare
142 -}
143 -
144 -src_configure() {
145 - gnome2_src_configure \
146 - --disable-mime-install \
147 - PYTHON="${EROOT}"/usr/bin/python2
148 -}
149
150 diff --git a/app-misc/gramps/metadata.xml b/app-misc/gramps/metadata.xml
151 index 4c493431ea9..74a0c40413b 100644
152 --- a/app-misc/gramps/metadata.xml
153 +++ b/app-misc/gramps/metadata.xml
154 @@ -89,8 +89,6 @@ zapolnjevanju vrzeli v rodoslovnih podatkih.
155 <pkg>sci-geosciences/osm-gps-map</pkg>.</flag>
156 <flag name="reports">All external software that is needed for graphical
157 reports will be installed</flag>
158 - <flag name="webkit">Use Webkit-based rendering for geographical
159 - data view.</flag>
160 </use>
161 <upstream>
162 <remote-id type="sourceforge">gramps</remote-id>