Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenSRF/, dev-libs/OpenSRF/files/, profiles/
Date: Thu, 01 Apr 2021 05:33:49
Message-Id: 1617255173.a8ab969ebb729f2f8f0b98cade32ec13a20583e8.juippis@gentoo
1 commit: a8ab969ebb729f2f8f0b98cade32ec13a20583e8
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 1 05:32:53 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 1 05:32:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ab969e
7
8 dev-libs/OpenSRF: remove last-rited package
9
10 Closes: https://bugs.gentoo.org/655502
11 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
12
13 dev-libs/OpenSRF/Manifest | 1 -
14 dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild | 122 ---------------------
15 .../OpenSRF/files/OpenSRF-2.1.1-buildfix.patch | 70 ------------
16 dev-libs/OpenSRF/metadata.xml | 7 --
17 profiles/package.mask | 6 -
18 5 files changed, 206 deletions(-)
19
20 diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest
21 deleted file mode 100644
22 index 125463559b6..00000000000
23 --- a/dev-libs/OpenSRF/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST opensrf-2.1.1.tar.gz 1058060 BLAKE2B 83c702727d21bea4683530857cd67037bde9eab94b91a801f64ebe70f5ad3b4994eea956cb9aaf531fbc663d4e9cb3242740f1941604a69aceaab8e396ae0e0e SHA512 5294ae2c9410ae52964067cd9090f9b7b5424e96f1731868cd896c1928ef1e89729af4a83f804f491bf2da0c6d129149105309afa18531b184098ebff2820306
27
28 diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
29 deleted file mode 100644
30 index ed235d5aab1..00000000000
31 --- a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
32 +++ /dev/null
33 @@ -1,122 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=5
38 -inherit eutils multilib flag-o-matic apache-module autotools perl-module
39 -
40 -DESCRIPTION="Framework for the high-level development of the Evergreen ILS software"
41 -HOMEPAGE="https://open-ils.org/"
42 -MY_PN="opensrf" # upstream lowercased the tarball in 2.x
43 -MY_P="${MY_PN}-${PV}"
44 -SRC_URI="https://open-ils.org/downloads/${MY_P}.tar.gz"
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE="postgres +sqlite"
49 -DEPEND=">=www-servers/apache-2.2.9
50 - >=dev-db/libdbi-drivers-0.8.2
51 - >=dev-db/libdbi-0.8.2
52 - net-im/ejabberd
53 - dev-libs/libmemcached
54 - dev-perl/Cache-Memcached
55 - dev-perl/Class-DBI-AbstractSearch
56 - sqlite? ( dev-perl/DBD-SQLite )
57 - postgres? ( dev-perl/DBD-Pg )
58 - virtual/perl-Digest-MD5
59 - dev-perl/JSON-XS
60 - dev-perl/Net-Server
61 - dev-perl/UNIVERSAL-require
62 - dev-perl/Unix-Syslog
63 - dev-perl/XML-LibXML
64 - "
65 -
66 -S="${WORKDIR}/${MY_P}"
67 -PERL_S="${S}/src/perl"
68 -
69 -APXS2_S="${S}/src/gateway/.libs/"
70 -APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so ${APXS2_S}/osrf_http_translator.so"
71 -#APACHE2_MOD_CONF="42_${PN}"
72 -#APACHE2_MOD_DEFINE="FOO"
73 -#DOCFILES="docs/*.html"
74 -need_apache2_2
75 -
76 -RDEPEND="${DEPEND}"
77 -
78 -pkg_setup() {
79 - perl_set_version
80 -}
81 -
82 -src_prepare() {
83 - epatch "${FILESDIR}"/${PN}-2.1.1-buildfix.patch
84 - eautoreconf
85 -}
86 -
87 -#src_compile() {
88 -# LIBXML2_CFLAGS=$(xml2-config --cflags)
89 -# LIBXML2_CFLAGS="${LIBXML2_CFLAGS//*-I}"
90 -# LIBXML2_HEADERS="${LIBXML2_CFLAGS// *}"
91 -# APR_HEADERS=$(apr-1-config --includedir)
92 -# APACHE2_HEADERS=$(apxs2 -q INCLUDEDIR)
93 -# sed -i \
94 -# -e '/^export PREFIX=/s,/.*,/usr,' \
95 -# -e '/^export BINDIR=/s,/.*,${PREFIX}/bin,' \
96 -# -e "/^export LIBDIR=/s,/.*,\${PREFIX}/$(get_libdir)," \
97 -# -e '/^export PERLDIR=/s,/.*,${LIBDIR}/perl5,' \
98 -# -e '/^export INCLUDEDIR=/s,/.*,${PREFIX}/include,' \
99 -# -e '/^export ETCDIR=/s,/.*,/etc,' \
100 -# -e '/^export SOCK=/s,/.*,/var/run/opensrf,' \
101 -# -e '/^export PID=/s,/.*,/var/run/opensrf,' \
102 -# -e '/^export LOG=/s,/.*,/var/log,' \
103 -# -e '/^export TMP=/s,/.*,/tmp,' \
104 -# -e '/^export APXS2=/s,/.*,/usr/sbin/apxs2,' \
105 -# -e "/^export APACHE2_HEADERS=/s,/.*,${APACHE2_HEADERS}," \
106 -# -e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \
107 -# -e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \
108 -# install.conf
109 -# emake verbose
110 -#}
111 -src_configure() {
112 - APXS2_INSTALL="-i" \
113 - econf \
114 - --with-apxs=/usr/sbin/apxs2 \
115 - --sysconfdir=/etc/opensrf \
116 - --localstatedir=/var
117 -
118 - cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed"
119 -}
120 -
121 -src_compile() {
122 - emake
123 - cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
124 -}
125 -
126 -src_install() {
127 - einfo "Doing src_install"
128 - #emake install-verbose DESTDIR="${D}"
129 - emake install DESTDIR="${D}" APXS2_INSTALL="-i"
130 - apache-module_src_install || die "apache-module_src_install failed"
131 - cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
132 - cd "${S}"
133 -
134 - # Docs
135 - dodoc README doc/*
136 -}
137 -
138 -src_test() {
139 - emake check
140 - cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed"
141 -}
142 -
143 -pkg_config() {
144 - :
145 - #JABBER_SERVER=${JABBER_SERVER:=localhost}
146 - #JABBER_PORT=${JABBER_PORT:=5222}
147 - #PASSWORD=${PASSWORD:=osrf}
148 - #einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}"
149 - #einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}"
150 - #cd "${ROOT}"/usr/share/doc/${PF}/examples
151 - #for user in osrf router ; do
152 - # perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \
153 - # || die "Failed to add $user user to server"
154 - #done
155 -}
156
157 diff --git a/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch
158 deleted file mode 100644
159 index 767a478b53a..00000000000
160 --- a/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch
161 +++ /dev/null
162 @@ -1,70 +0,0 @@
163 -Upstream uses DESTDIR, but then tries to hard-install the apache config
164 -modules, as well as not allowing other arguments to Build.PL easily.
165 -
166 -Split apache modules to be built during compile phase, and allow control of
167 -apxs2 install mode (for Gentoo, pass APXS2_INSTALL=-i).
168 -
169 -For the Build.PL problem, just disable it entirely here, and use the Gentoo
170 -build functions to call Build.PL instead
171 -(presently does --installdirs=vendor --libdoc= --destdir="${D}" --create_packlist=0).
172 -
173 -Signed-off-by: Robin H. Johnson <robbat2@g.o>
174 -
175 -diff -Nuar opensrf-2.1.1.orig/src/gateway/Makefile.am opensrf-2.1.1/src/gateway/Makefile.am
176 ---- opensrf-2.1.1.orig/src/gateway/Makefile.am 2012-11-06 17:39:46.000000000 +0000
177 -+++ opensrf-2.1.1/src/gateway/Makefile.am 2012-11-12 21:56:52.108564157 +0000
178 -@@ -17,20 +17,23 @@
179 - AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
180 - AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
181 - AP_LIBEXECDIR = `$(APXS2) -q LIBEXECDIR`
182 -+APXS2_INSTALL = -i -a
183 -
184 - DISTCLEANFILES = Makefile.in Makefile
185 -
186 --install-exec-local:
187 -- d=`$(APXS2) -q SYSCONFDIR` && \
188 -- if ! grep mod_placeholder $${d}/httpd.conf 2>&1 >/dev/null ; \
189 -- then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
190 -- >> $${d}/httpd.conf; \
191 -- fi
192 -+all:
193 - $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
194 - $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
195 -+
196 -+install-exec-local:
197 -+# d=`$(APXS2) -q SYSCONFDIR` && \
198 -+# if ! grep mod_placeholder $${d}/httpd.conf 2>&1 >/dev/null ; \
199 -+# then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
200 -+# >> $${d}/httpd.conf; \
201 -+# fi
202 - $(MKDIR_P) $(DESTDIR)$(AP_LIBEXECDIR)
203 -- $(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_json_gateway.la
204 -- $(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_http_translator.la
205 -+ $(APXS2) $(APXS2_INSTALL) -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_json_gateway.la
206 -+ $(APXS2) $(APXS2_INSTALL) -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_http_translator.la
207 -
208 - clean-local:
209 - rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo
210 -diff -Nuar opensrf-2.1.1.orig/configure.ac opensrf-2.1.1/configure.ac
211 ---- opensrf-2.1.1.orig/configure.ac 2012-11-06 17:39:46.000000000 +0000
212 -+++ opensrf-2.1.1/configure.ac 2012-11-12 22:04:38.673403306 +0000
213 -@@ -352,7 +352,6 @@
214 - src/gateway/Makefile
215 - src/jserver/Makefile
216 - src/libopensrf/Makefile
217 -- src/perl/Makefile
218 - src/ports/strn_compat/Makefile
219 - src/python/opensrf.py
220 - src/router/Makefile
221 -diff -Nuar opensrf-2.1.1.orig/src/Makefile.am opensrf-2.1.1/src/Makefile.am
222 ---- opensrf-2.1.1.orig/src/Makefile.am 2012-11-06 17:39:46.000000000 +0000
223 -+++ opensrf-2.1.1/src/Makefile.am 2012-11-12 22:04:35.580149012 +0000
224 -@@ -40,7 +40,7 @@
225 - endif
226 -
227 - if BUILDCORE
228 --MAYBE_CORE = libopensrf c-apps router srfsh gateway perl
229 -+MAYBE_CORE = libopensrf c-apps router srfsh gateway
230 - if BUILDPYTHON
231 - dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl @top_srcdir@/src/python/opensrf.py @top_srcdir@/src/python/srfsh.py
232 - else
233
234 diff --git a/dev-libs/OpenSRF/metadata.xml b/dev-libs/OpenSRF/metadata.xml
235 deleted file mode 100644
236 index 79d462e8557..00000000000
237 --- a/dev-libs/OpenSRF/metadata.xml
238 +++ /dev/null
239 @@ -1,7 +0,0 @@
240 -<?xml version="1.0" encoding="UTF-8"?>
241 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
242 -<pkgmetadata>
243 -<maintainer type="person">
244 - <email>robbat2@g.o</email>
245 -</maintainer>
246 -</pkgmetadata>
247
248 diff --git a/profiles/package.mask b/profiles/package.mask
249 index e09248d808f..2636535b715 100644
250 --- a/profiles/package.mask
251 +++ b/profiles/package.mask
252 @@ -540,12 +540,6 @@ net-misc/gnome-remote-desktop
253 # https://bugs.gentoo.org/700020
254 =app-arch/cpio-2.13
255
256 -# Lars Wendler <polynomial-c@g.o> (2019-10-16)
257 -# Joonas Niilola <juippis@g.o> (2021-03-18)
258 -# Depends on apache-2.2
259 -# Removal on 2021-04-01. Bug #655502
260 -dev-libs/OpenSRF
261 -
262 # Matt Turner <mattst88@g.o> (2019-09-01)
263 # TeXmacs is the only remaining package in tree that requires guile-1.8, which
264 # is unsupported upstream. A TeXmacs port to Guile-2 has been in progress for a
Report Message
Find on MARC Find on Google Groups