Bump.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 204 insertions, 2 deletions

diff --git a/dev-libs/OpenSRF/ChangeLog b/dev-libs/OpenSRF/ChangeLog
index 76eed783debe..c144258e1d75 100644
--- a/dev-libs/OpenSRF/ChangeLog
+++ b/dev-libs/OpenSRF/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/OpenSRF
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.10 2012/11/12 22:13:25 robbat2 Exp $
+
+*OpenSRF-2.1.1 (12 Nov 2012)
+
+  12 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +OpenSRF-2.1.1.ebuild,
+  +files/OpenSRF-2.1.1-buildfix.patch:
+  Bump.
 
 *OpenSRF-1.2.0 (12 Nov 2012)
 
diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest
index fa77de954ae4..522e369802f1 100644
--- a/dev-libs/OpenSRF/Manifest
+++ b/dev-libs/OpenSRF/Manifest
@@ -1,8 +1,11 @@
 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
+AUX OpenSRF-2.1.1-buildfix.patch 3436 SHA256 899c6e2239992b8c75df3485770595bc21ac09bfa4917924d019447e12dba990 SHA512 5db2d704a3d539c1c57ee3b5d4e0965f60c23134c68746ab84655d698388e10b7d611dff0e25db4c633fce462816c4d76afae9d74acdee5a95baeb99528e2b5b WHIRLPOOL 7a59f45e780dccfc6c42f7b4c851c91ed3954d445b683291ca8f6a6eace3941c62668011397109800a1d19e677848c18ecf3713100e09c8466da19cc02771bc1
 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
+DIST opensrf-2.1.1.tar.gz 1058060 SHA256 cf58f744ec18dcfeaf0b0f2199c499b0742ecc35e7adf1e27614ca210f70c5b8 SHA512 5294ae2c9410ae52964067cd9090f9b7b5424e96f1731868cd896c1928ef1e89729af4a83f804f491bf2da0c6d129149105309afa18531b184098ebff2820306 WHIRLPOOL fce4ca8fbebfcec091232ab156e9c4ea4bd445cc90528dc82b61a3e7cd8766382c551d3a277f7a76eea44c0c2e3d347d7805861c46581c89463f3689622fa0be
 EBUILD OpenSRF-1.0.7.ebuild 3600 SHA256 a31823aeb78dff0eabe36f2cf300b7ef5fc8fd023c7d127ea37d20d68cf75f91 SHA512 ce4aa3745e688298978fe9e2ebbad6d8b6d94241e03226fe83092db7bef908d24b87fdee4336aecc9f421b0a5bf8680dd929800eee94407d84aa151cfd89d2ca WHIRLPOOL b0403b46c87513d5c3ca3eac04c8511ba9c8e8f8f871c122e4e2a1684e7365e69902a31d490549d89d7f18ebc9e750b996dc2cdde980fb500ae6face6f0835e5
 EBUILD OpenSRF-1.2.0.ebuild 3701 SHA256 b0ad6638ffe7256bb23d33a5a4fe09a1691bd32140e0ab2312e1af8e5d6ec61b SHA512 d1452347bbe2a2a14c1202509d4e3ab628f7856937e996ba56b0bedefb31ec456e5bb1beceeff18b60ec7737357ace9584056442d9b241aee64cf89dcc43a385 WHIRLPOOL ae04bdb59c9aed2fc1c47fc30602a760d37976ed2768cc3460e7c73bc2e3cdd1f32b78f14c4cd1cb718f016ecaf4cc5cca5799b75cf806d9a866ad467a1d2ba0
-MISC ChangeLog 1974 SHA256 890e8de0214c6760daddfdb855abc5407bab757b0b2d96434fa98ad262fbd321 SHA512 826d17c174ae0bb64b6edbcfa1c24b8561975587cd18b41519fa48e4a3bab39885ad8655dd83538c3520410a9f339db7531d65fc8f6d05be9003b54e833615ed WHIRLPOOL a863bcc5b7022fff7a2bc5fa2d970397fd09aad2dd528f2df92550b176392fa225e3f829b858c3826a987c0c986c3c60c4a4be9206caf535ef64914273f1bc34
+EBUILD OpenSRF-2.1.1.ebuild 3847 SHA256 9bc5ab01e73efc4a32cd11c7d9180bb57143595b100d4e7d06cd656c9e39001d SHA512 6de369b8f8aa15c9b3d268c17340f4e18b86575dfa75473024079a50d087aec0d5a1090c8387aebbe30ebb5816018aa1cb343520087c7f40ae7f57fb21a3b916 WHIRLPOOL 2d410b909be1318685e20dbbd04f525a6bc8ada4f2466a896d352b6941488aa2a3d90b3e0e2c66555a5b3b3c795ca4b0bd6ebd045b966d421e73c02a9104bddc
+MISC ChangeLog 2129 SHA256 d6985d76eed840aa8961c7d795be6cd878fc999bc3afec8ab84acc8e69dfcb43 SHA512 ee0facddad59f975e005a915bf355d9b918cc4b44eca97016d2b65888a9606477b6e2d96b30bea4c09c9fb642a2757db21cf6f3823f2da91a3ea722efc8ec458 WHIRLPOOL 0de26ad13b8084c1a60c309dbfea87486830aaaa9f1b68d1eb1382eac762579170604d2b6dfc2732a9141d6a838047a444ffdc09c1862d32b2d5c09b9e9e54d1
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
new file mode 100644
index 000000000000..70aa461f758b
--- /dev/null
+++ b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
@@ -0,0 +1,123 @@
+# 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-2.1.1.ebuild,v 1.1 2012/11/12 22:13:25 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/"
+MY_PN="opensrf" # upstream lowercased the tarball in 2.x
+MY_P="${MY_PN}-${PV}"
+SRC_URI="http://open-ils.org/downloads/${MY_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
+		"
+
+S="${WORKDIR}/${MY_P}"
+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}-2.1.1-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() {
+	APXS2_INSTALL="-i" \
+	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}" APXS2_INSTALL="-i" || 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-2.1.1-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch
new file mode 100644
index 000000000000..767a478b53a8
--- /dev/null
+++ b/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch
@@ -0,0 +1,70 @@
+Upstream uses DESTDIR, but then tries to hard-install the apache config
+modules, as well as not allowing other arguments to Build.PL easily.
+
+Split apache modules to be built during compile phase, and allow control of
+apxs2 install mode (for Gentoo, pass APXS2_INSTALL=-i).
+
+For the Build.PL problem, just disable it entirely here, and use the Gentoo
+build functions to call Build.PL instead 
+(presently does --installdirs=vendor --libdoc= --destdir="${D}" --create_packlist=0).
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar opensrf-2.1.1.orig/src/gateway/Makefile.am opensrf-2.1.1/src/gateway/Makefile.am
+--- opensrf-2.1.1.orig/src/gateway/Makefile.am	2012-11-06 17:39:46.000000000 +0000
++++ opensrf-2.1.1/src/gateway/Makefile.am	2012-11-12 21:56:52.108564157 +0000
+@@ -17,20 +17,23 @@
+ 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
+ AP_LIBEXECDIR = `$(APXS2) -q LIBEXECDIR`
++APXS2_INSTALL = -i -a
+ 
+ DISTCLEANFILES = Makefile.in Makefile
+ 
+-install-exec-local: 
+-	d=`$(APXS2) -q SYSCONFDIR` && \
+-		if ! grep mod_placeholder $${d}/httpd.conf 2>&1 >/dev/null ; \
+-		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
+-		>> $${d}/httpd.conf; \
+-	fi
++all:
+ 	$(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
++
++install-exec-local:
++#	d=`$(APXS2) -q SYSCONFDIR` && \
++#		if ! grep mod_placeholder $${d}/httpd.conf 2>&1 >/dev/null ; \
++#		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
++#		>> $${d}/httpd.conf; \
++#	fi
+ 	$(MKDIR_P) $(DESTDIR)$(AP_LIBEXECDIR)
+-	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_json_gateway.la
+-	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_http_translator.la
++	$(APXS2) $(APXS2_INSTALL) -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_json_gateway.la
++	$(APXS2) $(APXS2_INSTALL) -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/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-2.1.1.orig/configure.ac opensrf-2.1.1/configure.ac
+--- opensrf-2.1.1.orig/configure.ac	2012-11-06 17:39:46.000000000 +0000
++++ opensrf-2.1.1/configure.ac	2012-11-12 22:04:38.673403306 +0000
+@@ -352,7 +352,6 @@
+ 			 src/gateway/Makefile
+ 			 src/jserver/Makefile
+ 			 src/libopensrf/Makefile
+-			 src/perl/Makefile
+ 			 src/ports/strn_compat/Makefile
+ 			 src/python/opensrf.py
+ 			 src/router/Makefile
+diff -Nuar opensrf-2.1.1.orig/src/Makefile.am opensrf-2.1.1/src/Makefile.am
+--- opensrf-2.1.1.orig/src/Makefile.am	2012-11-06 17:39:46.000000000 +0000
++++ opensrf-2.1.1/src/Makefile.am	2012-11-12 22:04:35.580149012 +0000
+@@ -40,7 +40,7 @@
+ endif
+ 
+ if BUILDCORE
+-MAYBE_CORE = libopensrf c-apps router srfsh gateway perl
++MAYBE_CORE = libopensrf c-apps router srfsh gateway
+ if BUILDPYTHON
+ dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl @top_srcdir@/src/python/opensrf.py @top_srcdir@/src/python/srfsh.py
+ else