| 1 |
commit: e2ad6e1b2a029cee9b985ceefb2a7681d38e6693 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 9 09:54:20 2018 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 9 09:54:20 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2ad6e1b |
| 7 |
|
| 8 |
dev-libs/OpenSRF: Drop old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-libs/OpenSRF/Manifest | 1 - |
| 13 |
dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild | 118 ------------------ |
| 14 |
.../OpenSRF/files/OpenSRF-1.2.0-buildfix.patch | 136 --------------------- |
| 15 |
3 files changed, 255 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest |
| 18 |
index 27a2f2b0428..125463559b6 100644 |
| 19 |
--- a/dev-libs/OpenSRF/Manifest |
| 20 |
+++ b/dev-libs/OpenSRF/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST OpenSRF-1.2.0.tar.gz 1096952 BLAKE2B 87e1b125463db9cb90737b2c4b5821de6ea01d6229e936b8edd9f8883b72bf0b4006916243c06c31383e68a3b2a806207ca2385476e95b01c11ac810aa47a8b6 SHA512 f6ee045b32464316eefb457dc74bd08f3a613fcd22ea54ea719a1762b38ea14972d75802d2a542f3c7489c86cea25cb6a9de61662031104b0c0b3634e1d09cd1 |
| 23 |
DIST opensrf-2.1.1.tar.gz 1058060 BLAKE2B 83c702727d21bea4683530857cd67037bde9eab94b91a801f64ebe70f5ad3b4994eea956cb9aaf531fbc663d4e9cb3242740f1941604a69aceaab8e396ae0e0e SHA512 5294ae2c9410ae52964067cd9090f9b7b5424e96f1731868cd896c1928ef1e89729af4a83f804f491bf2da0c6d129149105309afa18531b184098ebff2820306 |
| 24 |
|
| 25 |
diff --git a/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild b/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild |
| 26 |
deleted file mode 100644 |
| 27 |
index b6ea23b6ef8..00000000000 |
| 28 |
--- a/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,118 +0,0 @@ |
| 31 |
-# Copyright 1999-2016 Gentoo Foundation |
| 32 |
-# Distributed under the terms of the GNU General Public License v2 |
| 33 |
- |
| 34 |
-EAPI=5 |
| 35 |
-inherit eutils multilib flag-o-matic apache-module autotools perl-module |
| 36 |
- |
| 37 |
-DESCRIPTION="Framework for the high-level development of the Evergreen ILS software" |
| 38 |
-HOMEPAGE="http://open-ils.org/" |
| 39 |
-SRC_URI="http://open-ils.org/downloads/${P}.tar.gz" |
| 40 |
-LICENSE="GPL-2" |
| 41 |
-SLOT="0" |
| 42 |
-KEYWORDS="~x86 ~amd64" |
| 43 |
-IUSE="postgres +sqlite" |
| 44 |
-DEPEND=">=www-servers/apache-2.2.9 |
| 45 |
- >=dev-db/libdbi-drivers-0.8.2 |
| 46 |
- >=dev-db/libdbi-0.8.2 |
| 47 |
- net-im/ejabberd |
| 48 |
- dev-libs/libmemcache |
| 49 |
- dev-perl/Cache-Memcached |
| 50 |
- dev-perl/Class-DBI-AbstractSearch |
| 51 |
- sqlite? ( dev-perl/DBD-SQLite ) |
| 52 |
- postgres? ( dev-perl/DBD-Pg ) |
| 53 |
- virtual/perl-Digest-MD5 |
| 54 |
- dev-perl/JSON-XS |
| 55 |
- dev-perl/Net-Server |
| 56 |
- dev-perl/UNIVERSAL-require |
| 57 |
- dev-perl/Unix-Syslog |
| 58 |
- dev-perl/XML-LibXML |
| 59 |
- " |
| 60 |
- |
| 61 |
-PERL_S="${S}/src/perl" |
| 62 |
- |
| 63 |
-APXS2_S="${S}/src/gateway/.libs/" |
| 64 |
-APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so ${APXS2_S}/osrf_http_translator.so" |
| 65 |
-#APACHE2_MOD_CONF="42_${PN}" |
| 66 |
-#APACHE2_MOD_DEFINE="FOO" |
| 67 |
-#DOCFILES="docs/*.html" |
| 68 |
-need_apache2_2 |
| 69 |
- |
| 70 |
-RDEPEND="${DEPEND}" |
| 71 |
- |
| 72 |
-pkg_setup() { |
| 73 |
- perl_set_version |
| 74 |
-} |
| 75 |
- |
| 76 |
-src_prepare() { |
| 77 |
- epatch "${FILESDIR}"/${PN}-1.2.0-buildfix.patch |
| 78 |
- eautoreconf |
| 79 |
-} |
| 80 |
- |
| 81 |
-#src_compile() { |
| 82 |
-# LIBXML2_CFLAGS=$(xml2-config --cflags) |
| 83 |
-# LIBXML2_CFLAGS="${LIBXML2_CFLAGS//*-I}" |
| 84 |
-# LIBXML2_HEADERS="${LIBXML2_CFLAGS// *}" |
| 85 |
-# APR_HEADERS=$(apr-1-config --includedir) |
| 86 |
-# APACHE2_HEADERS=$(apxs2 -q INCLUDEDIR) |
| 87 |
-# sed -i \ |
| 88 |
-# -e '/^export PREFIX=/s,/.*,/usr,' \ |
| 89 |
-# -e '/^export BINDIR=/s,/.*,${PREFIX}/bin,' \ |
| 90 |
-# -e "/^export LIBDIR=/s,/.*,\${PREFIX}/$(get_libdir)," \ |
| 91 |
-# -e '/^export PERLDIR=/s,/.*,${LIBDIR}/perl5,' \ |
| 92 |
-# -e '/^export INCLUDEDIR=/s,/.*,${PREFIX}/include,' \ |
| 93 |
-# -e '/^export ETCDIR=/s,/.*,/etc,' \ |
| 94 |
-# -e '/^export SOCK=/s,/.*,/var/run/opensrf,' \ |
| 95 |
-# -e '/^export PID=/s,/.*,/var/run/opensrf,' \ |
| 96 |
-# -e '/^export LOG=/s,/.*,/var/log,' \ |
| 97 |
-# -e '/^export TMP=/s,/.*,/tmp,' \ |
| 98 |
-# -e '/^export APXS2=/s,/.*,/usr/sbin/apxs2,' \ |
| 99 |
-# -e "/^export APACHE2_HEADERS=/s,/.*,${APACHE2_HEADERS}," \ |
| 100 |
-# -e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \ |
| 101 |
-# -e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \ |
| 102 |
-# install.conf |
| 103 |
-# emake verbose || die "Failed to build" |
| 104 |
-#} |
| 105 |
-src_configure() { |
| 106 |
- econf \ |
| 107 |
- --with-apxs=/usr/sbin/apxs2 \ |
| 108 |
- --sysconfdir=/etc/opensrf \ |
| 109 |
- --localstatedir=/var \ |
| 110 |
- || die "econf failed" |
| 111 |
- cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed" |
| 112 |
-} |
| 113 |
- |
| 114 |
-src_compile() { |
| 115 |
- emake || die "main emake failed" |
| 116 |
- cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed" |
| 117 |
-} |
| 118 |
- |
| 119 |
-src_install() { |
| 120 |
- einfo "Doing src_install" |
| 121 |
- #emake install-verbose DESTDIR="${D}" || die "Failed to install" |
| 122 |
- emake install DESTDIR="${D}" || die "Failed to install" |
| 123 |
- apache-module_src_install || die "apache-module_src_install failed" |
| 124 |
- cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed" |
| 125 |
- cd "${S}" |
| 126 |
- |
| 127 |
- # Docs |
| 128 |
- dodoc README doc/* |
| 129 |
-} |
| 130 |
- |
| 131 |
-src_test() { |
| 132 |
- emake check || die "emake check failed" |
| 133 |
- cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed" |
| 134 |
-} |
| 135 |
- |
| 136 |
-pkg_config() { |
| 137 |
- : |
| 138 |
- #JABBER_SERVER=${JABBER_SERVER:=localhost} |
| 139 |
- #JABBER_PORT=${JABBER_PORT:=5222} |
| 140 |
- #PASSWORD=${PASSWORD:=osrf} |
| 141 |
- #einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}" |
| 142 |
- #einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}" |
| 143 |
- #cd "${ROOT}"/usr/share/doc/${PF}/examples |
| 144 |
- #for user in osrf router ; do |
| 145 |
- # perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \ |
| 146 |
- # || die "Failed to add $user user to server" |
| 147 |
- #done |
| 148 |
-} |
| 149 |
|
| 150 |
diff --git a/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch |
| 151 |
deleted file mode 100644 |
| 152 |
index 33963fe3043..00000000000 |
| 153 |
--- a/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch |
| 154 |
+++ /dev/null |
| 155 |
@@ -1,136 +0,0 @@ |
| 156 |
-diff -Nuar OpenSRF-1.2.0.orig/Makefile.am OpenSRF-1.2.0/Makefile.am |
| 157 |
---- OpenSRF-1.2.0.orig/Makefile.am 2008-10-27 05:07:06.000000000 +0000 |
| 158 |
-+++ OpenSRF-1.2.0/Makefile.am 2012-11-12 20:53:22.079732392 +0000 |
| 159 |
-@@ -115,14 +115,14 @@ |
| 160 |
- SUBDIRS = src |
| 161 |
- |
| 162 |
- jserver: |
| 163 |
-- make -s -C src jserver |
| 164 |
-+ $(MAKE) -s -C src jserver |
| 165 |
- |
| 166 |
- jserver-install: |
| 167 |
-- make -s -C src jserver-install |
| 168 |
-+ $(MAKE) -s -C src jserver-install |
| 169 |
- |
| 170 |
- javascript-install: |
| 171 |
-- make -s -C src javascript-install |
| 172 |
-+ $(MAKE) -s -C src javascript-install |
| 173 |
- |
| 174 |
- install-data-hook: |
| 175 |
-- cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h |
| 176 |
-+ cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h |
| 177 |
- |
| 178 |
-diff -Nuar OpenSRF-1.2.0.orig/src/gateway/Makefile.am OpenSRF-1.2.0/src/gateway/Makefile.am |
| 179 |
---- OpenSRF-1.2.0.orig/src/gateway/Makefile.am 2008-08-18 19:14:00.000000000 +0000 |
| 180 |
-+++ OpenSRF-1.2.0/src/gateway/Makefile.am 2012-11-12 20:53:22.079732392 +0000 |
| 181 |
-@@ -16,16 +16,25 @@ |
| 182 |
- |
| 183 |
- AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) |
| 184 |
- AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf |
| 185 |
-+APACHE_DEPS = apachetools.c apachetools.h |
| 186 |
-+LIBS=libopensrf.so |
| 187 |
-+TARGETS = osrf_json_gateway.la osrf_http_translator.la |
| 188 |
- |
| 189 |
--install-exec-local: |
| 190 |
-- if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \ |
| 191 |
-- then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \ |
| 192 |
-- >> `apxs2 -q SYSCONFDIR`/httpd.conf; \ |
| 193 |
-- fi |
| 194 |
-- $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so |
| 195 |
-- $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so |
| 196 |
-- $(APXS2) -i -a @srcdir@/osrf_json_gateway.la |
| 197 |
-- $(APXS2) -i -a @srcdir@/osrf_http_translator.la |
| 198 |
-+all: $(TARGETS) |
| 199 |
-+ |
| 200 |
-+osrf_json_gateway.la: osrf_json_gateway.c $(APACHE_DEPS) |
| 201 |
-+ $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS) |
| 202 |
-+ |
| 203 |
-+osrf_http_translator.la: osrf_http_translator.c $(APACHE_DEPS) |
| 204 |
-+ $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS) |
| 205 |
-+ |
| 206 |
-+#install-exec-local: $(TARGETS) |
| 207 |
-+# if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \ |
| 208 |
-+# then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \ |
| 209 |
-+# >> `apxs2 -q SYSCONFDIR`/httpd.conf; \ |
| 210 |
-+# fi |
| 211 |
-+# $(APXS2) -i -a osrf_json_gateway.la |
| 212 |
-+# $(APXS2) -i -a osrf_http_translator.la |
| 213 |
- |
| 214 |
- clean-local: |
| 215 |
- 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 |
| 216 |
-diff -Nuar OpenSRF-1.2.0.orig/src/java/Makefile.am OpenSRF-1.2.0/src/java/Makefile.am |
| 217 |
---- OpenSRF-1.2.0.orig/src/java/Makefile.am 2008-07-17 18:15:09.000000000 +0000 |
| 218 |
-+++ OpenSRF-1.2.0/src/java/Makefile.am 2012-11-12 20:53:22.079732392 +0000 |
| 219 |
-@@ -48,8 +48,8 @@ |
| 220 |
- rm files; |
| 221 |
- |
| 222 |
- install-data-local: |
| 223 |
-- mkdir -p $(LIBDIR)/java |
| 224 |
-- cp opensrf.jar $(LIBDIR)/java |
| 225 |
-+ mkdir -p $(DESTDIR)$(LIBDIR)/java |
| 226 |
-+ cp opensrf.jar $(DESTDIR)$(LIBDIR)/java |
| 227 |
- |
| 228 |
- dep_clean: |
| 229 |
- rm -rf deps |
| 230 |
-diff -Nuar OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am OpenSRF-1.2.0/src/libopensrf/Makefile.am |
| 231 |
---- OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am 2009-04-08 02:48:02.000000000 +0000 |
| 232 |
-+++ OpenSRF-1.2.0/src/libopensrf/Makefile.am 2012-11-12 20:53:22.079732392 +0000 |
| 233 |
-@@ -99,6 +99,7 @@ |
| 234 |
- opensrf_c_SOURCES = opensrf.c |
| 235 |
- opensrf_c_DEPENDENCIES = libopensrf.la |
| 236 |
- |
| 237 |
-+osrf_json_test_DEPENDENCIES = libopensrf.la libosrf_json.la |
| 238 |
- osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS) |
| 239 |
- |
| 240 |
- noinst_LTLIBRARIES = libosrf_json.la |
| 241 |
-diff -Nuar OpenSRF-1.2.0.orig/src/Makefile.am OpenSRF-1.2.0/src/Makefile.am |
| 242 |
---- OpenSRF-1.2.0.orig/src/Makefile.am 2009-05-31 19:49:00.000000000 +0000 |
| 243 |
-+++ OpenSRF-1.2.0/src/Makefile.am 2012-11-12 20:53:52.475676800 +0000 |
| 244 |
-@@ -17,7 +17,7 @@ |
| 245 |
- export OPENSRF = opensrf |
| 246 |
- export BINDIR = @bindir@ |
| 247 |
- export LIBDIR = @libdir@ |
| 248 |
--jsdir = $(LIBDIR)/javascript |
| 249 |
-+jsdir = $(datarootdir)/opensrf/javascript |
| 250 |
- export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@ |
| 251 |
- etcdir = $(ETCDIR) |
| 252 |
- |
| 253 |
-@@ -33,7 +33,7 @@ |
| 254 |
- MAYBE_JA = java |
| 255 |
- endif |
| 256 |
- |
| 257 |
--SUBDIRS = libopensrf c-apps router srfsh jserver gateway perl $(MAYBE_PY) $(MAYBE_JA) |
| 258 |
-+SUBDIRS = libopensrf c-apps router srfsh jserver gateway $(MAYBE_PY) $(MAYBE_JA) # perl is now seperate |
| 259 |
- |
| 260 |
- dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl |
| 261 |
- bin_SCRIPTS = @top_srcdir@/bin/osrf_config @top_srcdir@/bin/osrf_ctl.sh |
| 262 |
-@@ -41,11 +41,11 @@ |
| 263 |
- dist_sysconf_DATA = @top_srcdir@/examples/opensrf.xml.example @top_srcdir@/examples/opensrf_core.xml.example @top_srcdir@/examples/srfsh.xml.example |
| 264 |
- |
| 265 |
- install-exec-local: |
| 266 |
-- mkdir -p $(VAR) |
| 267 |
-- mkdir -p $(PID) |
| 268 |
-- mkdir -p $(LOG) |
| 269 |
-- mkdir -p $(SOCK) |
| 270 |
-- mkdir -p $(jsdir) |
| 271 |
-+ mkdir -p $(DESTDIR)$(VAR) |
| 272 |
-+ mkdir -p $(DESTDIR)$(PID) |
| 273 |
-+ mkdir -p $(DESTDIR)$(LOG) |
| 274 |
-+ mkdir -p $(DESTDIR)$(SOCK) |
| 275 |
-+ mkdir -p $(DESTDIR)$(jsdir) |
| 276 |
- |
| 277 |
- install-exec-hook: |
| 278 |
- sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example' |
| 279 |
-@@ -54,9 +54,9 @@ |
| 280 |
- sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example' |
| 281 |
- sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example' |
| 282 |
- sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example' |
| 283 |
-- cp -r @srcdir@/javascript/* $(jsdir)/ |
| 284 |
-+ cp -r @srcdir@/javascript/* $(DESTDIR)$(jsdir)/ |
| 285 |
- |
| 286 |
- uninstall-hook: |
| 287 |
-- rm @includedir@/opensrf/apachetools.h |
| 288 |
-- rm -R $(jsdir) |
| 289 |
-+ rm $(DESTDIR)@includedir@/opensrf/apachetools.h |
| 290 |
-+ rm -R $(DESTDIR)$(jsdir) |
| 291 |
- |
Archives