diff options
| -rw-r--r-- | dev-libs/OpenSRF/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-libs/OpenSRF/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild | 119 | ||||
| -rw-r--r-- | dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch | 136 |
4 files changed, 267 insertions, 4 deletions
diff --git a/dev-libs/OpenSRF/ChangeLog b/dev-libs/OpenSRF/ChangeLog index 12dbc3cf112e..76eed783debe 100644 --- a/dev-libs/OpenSRF/ChangeLog +++ b/dev-libs/OpenSRF/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/OpenSRF -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.8 2009/11/10 08:43:44 robbat2 Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.9 2012/11/12 21:01:03 robbat2 Exp $ + +*OpenSRF-1.2.0 (12 Nov 2012) + + 12 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +OpenSRF-1.2.0.ebuild, + +files/OpenSRF-1.2.0-buildfix.patch: + Bump. 10 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> -OpenSRF-0.9.ebuild, -files/OpenSRF-0.9-buildfix.patch, -OpenSRF-1.0.1.ebuild, @@ -42,4 +48,3 @@ +files/OpenSRF-0.9-buildfix.patch, +metadata.xml, +OpenSRF-0.9.ebuild: Initial commit. Ebuild by Robin H Johnson <robbat2@gentoo.org>. Dependancy for Evergreen ILS. Still needs more pkg_config instructions. - diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest index ed57cc18ae01..fa77de954ae4 100644 --- a/dev-libs/OpenSRF/Manifest +++ b/dev-libs/OpenSRF/Manifest @@ -1,5 +1,8 @@ AUX OpenSRF-1.0.7-buildfix.patch 6071 SHA256 c76c3b09f2d7877cfb096efa76e7e5f33406390f1b9861129f83dc4156468bef SHA512 b9c0714cd14ec6a8d82b18b5b8eebc0d91611c70658a751ffd008638f8518743cc2abcf971d917cf3efc8e1ff08f5f7d34d922895550a1da484e85bdc9041f8a WHIRLPOOL 900b8b2e5602c0ff8d5f8b696ad727e4df201721fe73206366c3aabdf799c2a49ebd164ada19f36c95eff404896fa36d57273493d557db4c5ea87bba8d805434 +AUX OpenSRF-1.2.0-buildfix.patch 5565 SHA256 9aaaf8e81fb19060cc0f8de675383868356cca82a8de4bfd39da05a057fdd53c SHA512 febe3759fd4923f686bfc46f8d8f18bd463521e0ff930d0259533f173f11cb42842c3ddfe2930b52648873aad45b19eff1d5f328a8237f7e8f94eba63a35830f WHIRLPOOL 7d423e655e5a98a1275b3a16466d8c24dde01f5dba366c8c45e648373aeb71a7ac7aae1f8b3052f8e9348f34df194ac70fa03933901a7249ed50ed2885c18f79 DIST OpenSRF-1.0.7.tar.gz 1082429 SHA256 6b4ad2a571446630ba88eb100ec9a1a88e00c9cbe3127278c360ccaab99c90b1 SHA512 b3b9d2016e42ac2bbb048bf7ade8c87ba6bc37a73e6c21ea86eb21443bab9640d843df91e7372e570e1dc9068ad4f7a50d054ff2d740e0f6ade8181513cf1752 WHIRLPOOL 76219478a2786365e1aacf2e9d47b5f47a4c0abb38496ee8054e2e868f608b6d5fee6804614fdb994d1313cec8793e905d81e9d95ddaef807fea95f7d576a20a +DIST OpenSRF-1.2.0.tar.gz 1096952 SHA256 e1cba4710f5244fdcc5afae84b71d7b2f8265f1fdea72b51cf0f64e756617f2d SHA512 f6ee045b32464316eefb457dc74bd08f3a613fcd22ea54ea719a1762b38ea14972d75802d2a542f3c7489c86cea25cb6a9de61662031104b0c0b3634e1d09cd1 WHIRLPOOL 74ae8c5f464e8e3e3cc8ac35f0ba09ec8734f1e8f724f7161956917d2c80dfe4cc8ac8bff6c232483e4ec016a82e5dcc919f9c0e5b38aac55fbd7f75d0fd2997 EBUILD OpenSRF-1.0.7.ebuild 3600 SHA256 a31823aeb78dff0eabe36f2cf300b7ef5fc8fd023c7d127ea37d20d68cf75f91 SHA512 ce4aa3745e688298978fe9e2ebbad6d8b6d94241e03226fe83092db7bef908d24b87fdee4336aecc9f421b0a5bf8680dd929800eee94407d84aa151cfd89d2ca WHIRLPOOL b0403b46c87513d5c3ca3eac04c8511ba9c8e8f8f871c122e4e2a1684e7365e69902a31d490549d89d7f18ebc9e750b996dc2cdde980fb500ae6face6f0835e5 -MISC ChangeLog 1821 SHA256 84ff9286568ab94ff346ed2bae533e36970a6d6333e875b260130a6bed3ca648 SHA512 bf59abac9e84f92f68e5816afbba0670c7bd98321b817b4eb62db399beeea4d5762ccbf456b3f558f6f424f7c88f51ee49432d571c7a252b723ec84ba427ab1d WHIRLPOOL a9d3ccd11f05282545aa2b0f6228396cf584a2db045a01aa80b5cdd6b4388abf1f9da54b9c14c17777c5c8cb88729e619bdff43d638649294b2be4e643d61ba5 +EBUILD OpenSRF-1.2.0.ebuild 3701 SHA256 b0ad6638ffe7256bb23d33a5a4fe09a1691bd32140e0ab2312e1af8e5d6ec61b SHA512 d1452347bbe2a2a14c1202509d4e3ab628f7856937e996ba56b0bedefb31ec456e5bb1beceeff18b60ec7737357ace9584056442d9b241aee64cf89dcc43a385 WHIRLPOOL ae04bdb59c9aed2fc1c47fc30602a760d37976ed2768cc3460e7c73bc2e3cdd1f32b78f14c4cd1cb718f016ecaf4cc5cca5799b75cf806d9a866ad467a1d2ba0 +MISC ChangeLog 1974 SHA256 890e8de0214c6760daddfdb855abc5407bab757b0b2d96434fa98ad262fbd321 SHA512 826d17c174ae0bb64b6edbcfa1c24b8561975587cd18b41519fa48e4a3bab39885ad8655dd83538c3520410a9f339db7531d65fc8f6d05be9003b54e833615ed WHIRLPOOL a863bcc5b7022fff7a2bc5fa2d970397fd09aad2dd528f2df92550b176392fa225e3f829b858c3826a987c0c986c3c60c4a4be9206caf535ef64914273f1bc34 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0 diff --git a/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild b/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild new file mode 100644 index 000000000000..1bc0cbca763e --- /dev/null +++ b/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild,v 1.1 2012/11/12 21:01:02 robbat2 Exp $ + +EAPI=5 +inherit eutils multilib flag-o-matic apache-module autotools perl-module + +DESCRIPTION="Framework for the high-level development of the Evergreen ILS software" +HOMEPAGE="http://open-ils.org/" +SRC_URI="http://open-ils.org/downloads/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="postgres +sqlite" +DEPEND=">=www-servers/apache-2.2.9 + >=dev-db/libdbi-drivers-0.8.2 + >=dev-db/libdbi-0.8.2 + net-im/ejabberd + dev-libs/libmemcache + dev-perl/Cache-Memcached + dev-perl/Class-DBI-AbstractSearch + sqlite? ( dev-perl/DBD-SQLite ) + postgres? ( dev-perl/DBD-Pg ) + virtual/perl-Digest-MD5 + dev-perl/JSON-XS + dev-perl/net-server + dev-perl/UNIVERSAL-require + dev-perl/Unix-Syslog + dev-perl/XML-LibXML + " + +PERL_S="${S}/src/perl" + +APXS2_S="${S}/src/gateway/.libs/" +APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so ${APXS2_S}/osrf_http_translator.so" +#APACHE2_MOD_CONF="42_${PN}" +#APACHE2_MOD_DEFINE="FOO" +#DOCFILES="docs/*.html" +need_apache2_2 + +RDEPEND="${DEPEND}" + +pkg_setup() { + perl-module_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.0-buildfix.patch + eautoreconf +} + +#src_compile() { +# LIBXML2_CFLAGS=$(xml2-config --cflags) +# LIBXML2_CFLAGS="${LIBXML2_CFLAGS//*-I}" +# LIBXML2_HEADERS="${LIBXML2_CFLAGS// *}" +# APR_HEADERS=$(apr-1-config --includedir) +# APACHE2_HEADERS=$(apxs2 -q INCLUDEDIR) +# sed -i \ +# -e '/^export PREFIX=/s,/.*,/usr,' \ +# -e '/^export BINDIR=/s,/.*,${PREFIX}/bin,' \ +# -e "/^export LIBDIR=/s,/.*,\${PREFIX}/$(get_libdir)," \ +# -e '/^export PERLDIR=/s,/.*,${LIBDIR}/perl5,' \ +# -e '/^export INCLUDEDIR=/s,/.*,${PREFIX}/include,' \ +# -e '/^export ETCDIR=/s,/.*,/etc,' \ +# -e '/^export SOCK=/s,/.*,/var/run/opensrf,' \ +# -e '/^export PID=/s,/.*,/var/run/opensrf,' \ +# -e '/^export LOG=/s,/.*,/var/log,' \ +# -e '/^export TMP=/s,/.*,/tmp,' \ +# -e '/^export APXS2=/s,/.*,/usr/sbin/apxs2,' \ +# -e "/^export APACHE2_HEADERS=/s,/.*,${APACHE2_HEADERS}," \ +# -e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \ +# -e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \ +# install.conf +# emake verbose || die "Failed to build" +#} +src_configure() { + econf \ + --with-apxs=/usr/sbin/apxs2 \ + --sysconfdir=/etc/opensrf \ + --localstatedir=/var \ + || die "econf failed" + cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed" +} + +src_compile() { + emake || die "main emake failed" + cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed" +} + +src_install() { + einfo "Doing src_install" + #emake install-verbose DESTDIR="${D}" || die "Failed to install" + emake install DESTDIR="${D}" || die "Failed to install" + apache-module_src_install || die "apache-module_src_install failed" + cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed" + cd "${S}" + + # Docs + dodoc README doc/* +} + +src_test() { + emake check || die "emake check failed" + cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed" +} + +pkg_config() { + : + #JABBER_SERVER=${JABBER_SERVER:=localhost} + #JABBER_PORT=${JABBER_PORT:=5222} + #PASSWORD=${PASSWORD:=osrf} + #einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}" + #einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}" + #cd "${ROOT}"/usr/share/doc/${PF}/examples + #for user in osrf router ; do + # perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \ + # || die "Failed to add $user user to server" + #done +} diff --git a/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch new file mode 100644 index 000000000000..33963fe30436 --- /dev/null +++ b/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch @@ -0,0 +1,136 @@ +diff -Nuar OpenSRF-1.2.0.orig/Makefile.am OpenSRF-1.2.0/Makefile.am +--- OpenSRF-1.2.0.orig/Makefile.am 2008-10-27 05:07:06.000000000 +0000 ++++ OpenSRF-1.2.0/Makefile.am 2012-11-12 20:53:22.079732392 +0000 +@@ -115,14 +115,14 @@ + SUBDIRS = src + + jserver: +- make -s -C src jserver ++ $(MAKE) -s -C src jserver + + jserver-install: +- make -s -C src jserver-install ++ $(MAKE) -s -C src jserver-install + + javascript-install: +- make -s -C src javascript-install ++ $(MAKE) -s -C src javascript-install + + install-data-hook: +- cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h ++ cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h + +diff -Nuar OpenSRF-1.2.0.orig/src/gateway/Makefile.am OpenSRF-1.2.0/src/gateway/Makefile.am +--- OpenSRF-1.2.0.orig/src/gateway/Makefile.am 2008-08-18 19:14:00.000000000 +0000 ++++ OpenSRF-1.2.0/src/gateway/Makefile.am 2012-11-12 20:53:22.079732392 +0000 +@@ -16,16 +16,25 @@ + + AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) + AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf ++APACHE_DEPS = apachetools.c apachetools.h ++LIBS=libopensrf.so ++TARGETS = osrf_json_gateway.la osrf_http_translator.la + +-install-exec-local: +- if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \ +- then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \ +- >> `apxs2 -q SYSCONFDIR`/httpd.conf; \ +- fi +- $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so +- $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so +- $(APXS2) -i -a @srcdir@/osrf_json_gateway.la +- $(APXS2) -i -a @srcdir@/osrf_http_translator.la ++all: $(TARGETS) ++ ++osrf_json_gateway.la: osrf_json_gateway.c $(APACHE_DEPS) ++ $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS) ++ ++osrf_http_translator.la: osrf_http_translator.c $(APACHE_DEPS) ++ $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS) ++ ++#install-exec-local: $(TARGETS) ++# if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \ ++# then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \ ++# >> `apxs2 -q SYSCONFDIR`/httpd.conf; \ ++# fi ++# $(APXS2) -i -a osrf_json_gateway.la ++# $(APXS2) -i -a osrf_http_translator.la + + clean-local: + 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 +diff -Nuar OpenSRF-1.2.0.orig/src/java/Makefile.am OpenSRF-1.2.0/src/java/Makefile.am +--- OpenSRF-1.2.0.orig/src/java/Makefile.am 2008-07-17 18:15:09.000000000 +0000 ++++ OpenSRF-1.2.0/src/java/Makefile.am 2012-11-12 20:53:22.079732392 +0000 +@@ -48,8 +48,8 @@ + rm files; + + install-data-local: +- mkdir -p $(LIBDIR)/java +- cp opensrf.jar $(LIBDIR)/java ++ mkdir -p $(DESTDIR)$(LIBDIR)/java ++ cp opensrf.jar $(DESTDIR)$(LIBDIR)/java + + dep_clean: + rm -rf deps +diff -Nuar OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am OpenSRF-1.2.0/src/libopensrf/Makefile.am +--- OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am 2009-04-08 02:48:02.000000000 +0000 ++++ OpenSRF-1.2.0/src/libopensrf/Makefile.am 2012-11-12 20:53:22.079732392 +0000 +@@ -99,6 +99,7 @@ + opensrf_c_SOURCES = opensrf.c + opensrf_c_DEPENDENCIES = libopensrf.la + ++osrf_json_test_DEPENDENCIES = libopensrf.la libosrf_json.la + osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS) + + noinst_LTLIBRARIES = libosrf_json.la +diff -Nuar OpenSRF-1.2.0.orig/src/Makefile.am OpenSRF-1.2.0/src/Makefile.am +--- OpenSRF-1.2.0.orig/src/Makefile.am 2009-05-31 19:49:00.000000000 +0000 ++++ OpenSRF-1.2.0/src/Makefile.am 2012-11-12 20:53:52.475676800 +0000 +@@ -17,7 +17,7 @@ + export OPENSRF = opensrf + export BINDIR = @bindir@ + export LIBDIR = @libdir@ +-jsdir = $(LIBDIR)/javascript ++jsdir = $(datarootdir)/opensrf/javascript + export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@ + etcdir = $(ETCDIR) + +@@ -33,7 +33,7 @@ + MAYBE_JA = java + endif + +-SUBDIRS = libopensrf c-apps router srfsh jserver gateway perl $(MAYBE_PY) $(MAYBE_JA) ++SUBDIRS = libopensrf c-apps router srfsh jserver gateway $(MAYBE_PY) $(MAYBE_JA) # perl is now seperate + + dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl + bin_SCRIPTS = @top_srcdir@/bin/osrf_config @top_srcdir@/bin/osrf_ctl.sh +@@ -41,11 +41,11 @@ + dist_sysconf_DATA = @top_srcdir@/examples/opensrf.xml.example @top_srcdir@/examples/opensrf_core.xml.example @top_srcdir@/examples/srfsh.xml.example + + install-exec-local: +- mkdir -p $(VAR) +- mkdir -p $(PID) +- mkdir -p $(LOG) +- mkdir -p $(SOCK) +- mkdir -p $(jsdir) ++ mkdir -p $(DESTDIR)$(VAR) ++ mkdir -p $(DESTDIR)$(PID) ++ mkdir -p $(DESTDIR)$(LOG) ++ mkdir -p $(DESTDIR)$(SOCK) ++ mkdir -p $(DESTDIR)$(jsdir) + + install-exec-hook: + sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example' +@@ -54,9 +54,9 @@ + sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example' + sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example' + sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example' +- cp -r @srcdir@/javascript/* $(jsdir)/ ++ cp -r @srcdir@/javascript/* $(DESTDIR)$(jsdir)/ + + uninstall-hook: +- rm @includedir@/opensrf/apachetools.h +- rm -R $(jsdir) ++ rm $(DESTDIR)@includedir@/opensrf/apachetools.h ++ rm -R $(DESTDIR)$(jsdir) + |