Drop the old versions that had issues known to me, and are not dependancies for anything I am aware of.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

6 files changed, 8 insertions, 766 deletions

diff --git a/dev-libs/OpenSRF/ChangeLog b/dev-libs/OpenSRF/ChangeLog
index 75a8cf3b9da2..12dbc3cf112e 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.7 2009/11/10 08:42:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.8 2009/11/10 08:43:44 robbat2 Exp $
+
+  10 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> -OpenSRF-0.9.ebuild,
+  -files/OpenSRF-0.9-buildfix.patch, -OpenSRF-1.0.1.ebuild,
+  -files/OpenSRF-1.0.1-buildfix.patch:
+  Drop the old versions that had issues known to me, and are not
+  dependancies for anything I am aware of.
 
   10 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> OpenSRF-1.0.7.ebuild:
   Repoman cleanup.
diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest
index bc730d4de453..29bb6e76d8c0 100644
--- a/dev-libs/OpenSRF/Manifest
+++ b/dev-libs/OpenSRF/Manifest
@@ -1,11 +1,5 @@
-AUX OpenSRF-0.9-buildfix.patch 10610 RMD160 c70fc3ecbfb6add462d190dae0aa93d2e2985889 SHA1 7acfdb4cccf8285e3454528acd2159b17b176bb4 SHA256 1298392bf77506d29f3cb1096524455e538e6760edb2b6ada130171f21398f38
-AUX OpenSRF-1.0.1-buildfix.patch 7128 RMD160 45e391833a7b3e7fb6e216e68fb689fe44f47611 SHA1 dc7ac6196f1aae37f46666c240857e32d3f19566 SHA256 c380901d67883515c132d3b3c49642e0a29e3037311aa41739af5695941bb8b5
 AUX OpenSRF-1.0.7-buildfix.patch 6071 RMD160 eee9d278ae18dfb5099f9780f35a4eefb2dc52db SHA1 f7c290b935259daa25764e0b4d2b7cd933bc8a66 SHA256 c76c3b09f2d7877cfb096efa76e7e5f33406390f1b9861129f83dc4156468bef
-DIST OpenSRF-0.9.tar.gz 276345 RMD160 ee50fa4c1e0bc883f03988a3b96587ad8a721d1d SHA1 e10dd7def5c6dd32ceacc1096a104a42627219f8 SHA256 62b20e6cc40fbee84b6a754c01006fbb31b5bf588fcb9240efa507b4480b082c
-DIST OpenSRF-1.0.1.tar.gz 1080452 RMD160 6539521e6f8ec5aadb685d246caba8ccaa3cd9c6 SHA1 965e798b426c242b1deee9d302aa0ba9bb47b21d SHA256 b0683f6fa5c94ae7e093afa715a3d89624abfc86165e36ff6ea28dd61b3acac0
 DIST OpenSRF-1.0.7.tar.gz 1082429 RMD160 d7be6c8e432cea3cbf21f92493ddb57fcc1408f7 SHA1 2e4d9ff7cc73184f7b8c864696d1118ae7d298a2 SHA256 6b4ad2a571446630ba88eb100ec9a1a88e00c9cbe3127278c360ccaab99c90b1
-EBUILD OpenSRF-0.9.ebuild 3366 RMD160 aac1faab24cfc089361b9d5b73bfcf899d94c6b6 SHA1 2375e1bfd1f2ace0eae65d0df9d6e081eb5ccb6a SHA256 163e7e1396124ef1b4ac3a16b0dc6d989335040127a0b4b506767a6f1622884d
-EBUILD OpenSRF-1.0.1.ebuild 4296 RMD160 cc5389c74633e468b8294df5bb20dfa416f73ce7 SHA1 0a8ebda0baab068ead94810cd4bb2e7834b78502 SHA256 403e36642dad547670df64c880bbf544cd5186a2e695a79e34542421eeeba6ad
 EBUILD OpenSRF-1.0.7.ebuild 3600 RMD160 f45e0b1a54364f0a2c229c9c0d96d92a375dcae9 SHA1 86efa8ade0d756f2da41e4a91de56d529a8e6dc8 SHA256 a31823aeb78dff0eabe36f2cf300b7ef5fc8fd023c7d127ea37d20d68cf75f91
-MISC ChangeLog 1539 RMD160 65168008287e33357e1288e6956cdb8dc82425b4 SHA1 48a8e1f266dd066fd5a814b345432eee9e2686f1 SHA256 ec7ca8252b3cb18e6ccb1b8acab8721e44461772568158691fee544c3a554d64
+MISC ChangeLog 1821 RMD160 7ac7aeaef7e8ab2337e93fa1406b163acb28add0 SHA1 fdf58e47ffe0a62d7029a706777c5fba9b12fb93 SHA256 84ff9286568ab94ff346ed2bae533e36970a6d6333e875b260130a6bed3ca648
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/dev-libs/OpenSRF/OpenSRF-0.9.ebuild b/dev-libs/OpenSRF/OpenSRF-0.9.ebuild
deleted file mode 100644
index daa0d595165b..000000000000
--- a/dev-libs/OpenSRF/OpenSRF-0.9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/OpenSRF-0.9.ebuild,v 1.2 2008/09/29 14:46:47 mr_bones_ Exp $
-
-inherit eutils multilib flag-o-matic apache-module
-
-DESCRIPTION="OpenSRF is a framework that allows the development of software without requiring a detailed knowledge of Evergreen's structure."
-HOMEPAGE="http://open-ils.org/"
-SRC_URI="http://open-ils.org/downloads/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND=">=www-servers/apache-2.2.9
-		>=dev-libs/yaz-3.0
-		app-dicts/aspell-en
-		>=dev-lang/spidermonkey-1.6
-		>=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/DateTime
-		dev-perl/DateTime-Locale
-		dev-perl/DateTime-TimeZone
-		dev-perl/DBD-Pg
-		dev-perl/Email-Send
-		dev-perl/GD-Graph3d
-		dev-perl/Log-Log4perl
-		dev-perl/JSON-XS
-		dev-perl/XML-LibXML
-		dev-perl/XML-LibXSLT
-		dev-perl/XML-Simple
-		dev-perl/Template-Toolkit
-		dev-perl/Text-Aspell
-		dev-perl/UNIVERSAL-require
-		dev-perl/Unix-Syslog
-		dev-perl/Text-CSV-Simple
-		dev-perl/Text-CSV_XS
-		dev-perl/Spreadsheet-WriteExcel
-		dev-perl/Tie-IxHash
-		dev-perl/Net-XMPP
-		dev-perl/Authen-SASL
-		dev-perl/XML-Stream
-		dev-perl/net-server
-		dev-perl/Class-DBI-AbstractSearch
-		dev-perl/JavaScript-SpiderMonkey
-		dev-perl/MARC-Record
-		dev-perl/MARC-Charset
-		dev-perl/MARC-XML
-		dev-perl/Net-Z3950-ZOOM"
-
-APXS2_S="${S}/src/gateway"
-APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so"
-#APACHE2_MOD_CONF="42_${PN}"
-#APACHE2_MOD_DEFINE="FOO"
-#DOCFILES="docs/*.html"
-need_apache2_2
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-0.9-buildfix.patch
-}
-
-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_install() {
-	emake install-verbose DESTDIR="${D}" || die "Failed to install"
-	apache-module_src_install
-	insinto /usr/share/opensrf
-	doins src/javascript/*js
-	dodoc doc/*
-}
-
-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/OpenSRF-1.0.1.ebuild b/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild
deleted file mode 100644
index 78d6eb4fc2b4..000000000000
--- a/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild,v 1.4 2009/05/26 17:28:31 arfrever Exp $
-
-inherit eutils multilib flag-o-matic apache-module autotools perl-module
-
-DESCRIPTION="OpenSRF is a framework that allows the development of software without requiring a detailed knowledge of Evergreen's structure."
-HOMEPAGE="http://open-ils.org/"
-SRC_URI="http://open-ils.org/downloads/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND=">=www-servers/apache-2.2.9
-		>=dev-libs/yaz-3.0
-		app-dicts/aspell-en
-		>=dev-lang/spidermonkey-1.6
-		>=dev-db/libdbi-drivers-0.8.2
-		>=dev-db/libdbi-0.8.2
-		net-im/ejabberd
-		dev-libs/libmemcache
-		dev-perl/FreezeThaw
-		dev-perl/Cache-Memcached
-		dev-perl/DateTime
-		dev-perl/DateTime-Locale
-		dev-perl/DateTime-TimeZone
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/DBD-Pg
-		dev-perl/Email-Send
-		dev-perl/GD-Graph3d
-		dev-perl/Log-Log4perl
-		dev-perl/JSON-XS
-		dev-perl/XML-LibXML
-		dev-perl/XML-LibXSLT
-		dev-perl/XML-Simple
-		dev-perl/Template-Toolkit
-		dev-perl/Text-Aspell
-		dev-perl/UNIVERSAL-require
-		dev-perl/Unix-Syslog
-		dev-perl/Text-CSV
-		dev-perl/Text-CSV-Simple
-		dev-perl/Text-CSV_XS
-		dev-perl/Spreadsheet-WriteExcel
-		dev-perl/Tie-IxHash
-		dev-perl/Net-XMPP
-		dev-perl/Authen-SASL
-		dev-perl/XML-Stream
-		dev-perl/net-server
-		dev-perl/Class-DBI-AbstractSearch
-		dev-perl/JavaScript-SpiderMonkey
-		dev-perl/MARC-Record
-		dev-perl/MARC-Charset
-		dev-perl/MARC-XML
-		dev-perl/Net-Z3950-ZOOM"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.0.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_compile() {
-	econf \
-		--with-apxs=/usr/sbin/apxs2 \
-		--sysconfdir=/etc/opensrf \
-		--localstatedir=/var \
-		|| die "econf failed"
-	cd "${S}" && 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"
-	insinto /usr/share/opensrf
-	doins src/javascript/*js
-	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-0.9-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-0.9-buildfix.patch
deleted file mode 100644
index 8cd5e49abc6a..000000000000
--- a/dev-libs/OpenSRF/files/OpenSRF-0.9-buildfix.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-Clean up the build system:
-- Do NOT use anything outside the directory like an absolute /tmp
-- Use $(MAKE) to get parallel support
-- $(DESTDIR) fun
-- Disable the apache module install, do it from the ebuild
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/Makefile OpenSRF-0.9/Makefile
---- OpenSRF-0.9.orig/Makefile	2007-06-21 13:45:35.000000000 -0700
-+++ OpenSRF-0.9/Makefile	2008-09-28 21:01:49.000000000 -0700
-@@ -1,15 +1,18 @@
- all:
- 	@echo -e "\n * Run 'make verbose' to see full make output\n"
--	source install.conf && make -s -C src all
-+	source install.conf && $(MAKE) -s -C src all
- 
- verbose:
--	source install.conf && make -C src all
-+	source install.conf && $(MAKE) -C src all
- 
- jserver:
--	source install.conf && make -s -C src jserver
-+	source install.conf && $(MAKE) -s -C src jserver
- 
- install:
--	source install.conf && make -s -C src install
-+	source install.conf && $(MAKE) -s -C src install
-+
-+install-verbose:
-+	source install.conf && $(MAKE) -C src install
- 
- jserver-install:
- 	source install.conf && make -s -C src jserver-install
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/Makefile OpenSRF-0.9/src/Makefile
---- OpenSRF-0.9.orig/src/Makefile	2007-07-02 07:24:04.000000000 -0700
-+++ OpenSRF-0.9/src/Makefile	2008-09-28 21:00:08.000000000 -0700
-@@ -1,15 +1,17 @@
- # TOP level 'src' makefile for OpenSRF
- 
- 
--export TMPDIR			= $(TMP)/opensrf
- export OPENSRF			= opensrf
- export BINDIR			= $(PREFIX)/bin
- export LIBDIR			= $(PREFIX)/lib
- export PERLDIR			= $(LIBDIR)/perl5
- export INCLUDEDIR		= $(PREFIX)/include
- 
-+export BUILDDIR			= ../../build
-+export BUILDDIR_SHALLOW = ../build
- export LDLIBS			+= 
--export LDFLAGS			+= -Wl,-rpath=$(LIBDIR) -L $(TMPDIR) -L .
-+export LDFLAGS			+= -Wl,-rpath=$(LIBDIR) -L $(BUILDDIR) -L .
-+export CFLAGS			+= -D_LARGEFILE64_SOURCE
- export CFLAGS			+= -pipe -g -Wall -O2 -fPIC -I ../../include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \
- 								-I$(LIBXML2_HEADERS)/libxml -I$(APR_HEADERS) 
- 
-@@ -35,31 +37,31 @@
- # --------------------------------------------------------------------------------
- 
- prep:
--	mkdir -p $(TMPDIR)
-+	mkdir -p $(BUILDDIR_SHALLOW)
- 
- objson/libobjson.so:	prep
- 	@echo $@
--	make -C objson
-+	$(MAKE) -C objson
- 
- opensrf:	objson/libobjson.so
--	make -C libopensrf
--	make -C c-apps
-+	$(MAKE) -C libopensrf
-+	$(MAKE) -C c-apps
- 
- router: opensrf
- 	@echo $@
--	make -C router 
-+	$(MAKE) -C router 
- 
- srfsh: opensrf
- 	@echo $@
--	make -C srfsh
-+	$(MAKE) -C srfsh
- 
- gateway:	opensrf
- 	@echo $@
--	make -C gateway
-+	$(MAKE) -C gateway
- 
- jserver:	opensrf
- 	@echo $@
--	make -C jserver
-+	$(MAKE) -C jserver
- 
- 
- # --------------------------------------------------------------------------------
-@@ -69,60 +71,60 @@
- # make sure the install directories exist
- install-prep:	
- 	@echo $@
--	mkdir -p $(LIBDIR)
--	mkdir -p $(BINDIR)
--	mkdir -p $(PERLDIR)
--	mkdir -p $(INCLUDEDIR)
--	mkdir -p $(ETCDIR)
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	mkdir -p $(DESTDIR)$(PERLDIR)
-+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-+	mkdir -p $(DESTDIR)$(ETCDIR)
- 
- objson-install:	install-prep 
- 	@echo $@
--	make -C objson install
-+	$(MAKE) -C objson install
- 
- # installs libopensrf.so, opensrf-c, headers, example configs, and osrf_ctl.sh
- opensrf-install:	objson-install
- 	@echo $@
--	cp $(TMPDIR)/libopensrf.so $(LIBDIR)/libopensrf.so
--	cp -r ../include/opensrf $(INCLUDEDIR)
--	cp libopensrf/opensrf $(BINDIR)/opensrf-c
--	make -C c-apps install
--	cp ../bin/osrf_ctl.sh $(BINDIR)
--	cp ../examples/opensrf.xml.example $(ETCDIR)
--	cp ../examples/opensrf_core.xml.example $(ETCDIR)
--	cp ../examples/srfsh.xml.example $(ETCDIR)
-+	cp $(BUILDDIR_SHALLOW)/libopensrf.so $(DESTDIR)$(LIBDIR)/libopensrf.so
-+	cp -r ../include/opensrf $(DESTDIR)$(INCLUDEDIR)
-+	cp libopensrf/opensrf $(DESTDIR)$(BINDIR)/opensrf-c
-+	$(MAKE) -C c-apps install
-+	cp ../bin/osrf_ctl.sh $(DESTDIR)$(BINDIR)
-+	cp ../examples/opensrf.xml.example $(DESTDIR)$(ETCDIR)
-+	cp ../examples/opensrf_core.xml.example $(DESTDIR)$(ETCDIR)
-+	cp ../examples/srfsh.xml.example $(DESTDIR)$(ETCDIR)
- 
- gateway-install:	install-prep opensrf-install	
- 	@echo $@
--	make -C gateway install
-+	$(MAKE) -C gateway install
- 
- router-install:	install-prep opensrf-install
- 	@echo $@
--	make -C router install
-+	$(MAKE) -C router install
- 
- srfsh-install:	install-prep opensrf-install 
- 	@echo $@
--	make -C srfsh install
-+	$(MAKE) -C srfsh install
- 
- jserver-install:	install-prep 
- 	@echo $@
--	make -C jserver install
-+	$(MAKE) -C jserver install
- 
- perl-install:	install-prep
- 	@echo $@
--	cp -r perlmods/* $(PERLDIR)/
-+	cp -r perlmods/* $(DESTDIR)$(PERLDIR)/
- 
- 
- # --------------------------------------------------------------------------------
- # CLEAN	
- # --------------------------------------------------------------------------------
- clean:
--	make -C libopensrf clean
--	make -C router clean
--	make -C gateway clean
--	make -C jserver clean
--	make -C objson clean
--	make -C srfsh clean
--	make -C c-apps clean
--	/bin/rm -rf $(TMPDIR) *.o
-+	$(MAKE) -C libopensrf clean
-+	$(MAKE) -C router clean
-+	$(MAKE) -C gateway clean
-+	$(MAKE) -C jserver clean
-+	$(MAKE) -C objson clean
-+	$(MAKE) -C srfsh clean
-+	$(MAKE) -C c-apps clean
-+	/bin/rm -rf $(BUILDDIR_SHALLOW) *.o
- 
- 
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/c-apps/Makefile OpenSRF-0.9/src/c-apps/Makefile
---- OpenSRF-0.9.orig/src/c-apps/Makefile	2005-09-12 06:33:26.000000000 -0700
-+++ OpenSRF-0.9/src/c-apps/Makefile	2008-09-28 21:00:08.000000000 -0700
-@@ -8,18 +8,18 @@
- osrf_version.o: osrf_version.c
- 
- osrf_math.so: osrf_math.o
--	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_math.o -o $(TMPDIR)/osrf_math.so
-+	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_math.o -o osrf_math.so
- 
- osrf_dbmath.so: osrf_dbmath.o
--	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_dbmath.o -o $(TMPDIR)/osrf_dbmath.so
-+	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_dbmath.o -o osrf_dbmath.so
- 
- osrf_version.so: osrf_version.o
--	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_version.o -o $(TMPDIR)/osrf_version.so
-+	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_version.o -o osrf_version.so
- 
- install:
--	cp $(TMPDIR)/osrf_math.so $(LIBDIR)/
--	cp $(TMPDIR)/osrf_dbmath.so $(LIBDIR)/
--	cp $(TMPDIR)/osrf_version.so $(LIBDIR)/
-+	cp osrf_math.so $(DESTDIR)$(LIBDIR)
-+	cp osrf_dbmath.so $(DESTDIR)$(LIBDIR)
-+	cp osrf_version.so $(DESTDIR)$(LIBDIR)
- 
- clean:
- 	rm -f *.o *.so
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/gateway/Makefile OpenSRF-0.9/src/gateway/Makefile
---- OpenSRF-0.9.orig/src/gateway/Makefile	2006-04-14 08:17:22.000000000 -0700
-+++ OpenSRF-0.9/src/gateway/Makefile	2008-09-28 21:03:01.000000000 -0700
-@@ -2,14 +2,12 @@
- CFLAGS	+= -DASSUME_STATELESS 
- LDLIBS	+= -lobjson -lopensrf
- 
--all: osrf_json_gateway.so copy
-+all: osrf_json_gateway.so
- 
-+#robbat2 - DISABLED, we will do this inside the ebuild
- install: 
--	$(APXS2) -i -a -n osrf_json_gateway osrf_json_gateway.so
--	cp apachetools.h $(INCLUDEDIR)/opensrf/
--
--copy:
--	cp apachetools.h $(TMPDIR)
-+	cp apachetools.h $(DESTDIR)$(INCLUDEDIR)/opensrf/
-+#	$(APXS2) -i -a -n osrf_json_gateway osrf_json_gateway.so
- 
- apachetools.o:	apachetools.h apachetools.c
- 	$(CC) -c $(CFLAGS) apachetools.c -o $@
-@@ -17,9 +15,8 @@
- osrf_json_gateway.o:	osrf_json_gateway.c
- 	$(CC) -c $(CFLAGS) osrf_json_gateway.c -o $@
- 
--osrf_json_gateway.so:	copy apachetools.o osrf_json_gateway.o
-+osrf_json_gateway.so:	apachetools.o osrf_json_gateway.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared -W1 apachetools.o osrf_json_gateway.o -o osrf_json_gateway.so
- 
--
- clean:
- 	/bin/rm -f *.o *.so 
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/jserver/Makefile OpenSRF-0.9/src/jserver/Makefile
---- OpenSRF-0.9.orig/src/jserver/Makefile	2005-10-10 13:22:30.000000000 -0700
-+++ OpenSRF-0.9/src/jserver/Makefile	2008-09-28 21:00:08.000000000 -0700
-@@ -10,7 +10,7 @@
- osrf_chat_main.o: osrf_chat_main.c
- 
- install: 
--	cp chopchop $(BINDIR)
-+	cp chopchop $(DESTDIR)$(BINDIR)
- 
- clean:
- 	/bin/rm -f *.o chopchop
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/libopensrf/Makefile OpenSRF-0.9/src/libopensrf/Makefile
---- OpenSRF-0.9.orig/src/libopensrf/Makefile	2007-06-21 09:22:02.000000000 -0700
-+++ OpenSRF-0.9/src/libopensrf/Makefile	2008-09-28 21:00:08.000000000 -0700
-@@ -39,10 +39,9 @@
- 	@echo $@
- 	$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lopensrf opensrf.o -o $@
- 
--
- # Build the OpenSRF library
- libopensrf.so:	$(TARGETS)
--	$(CC) -shared -W1 $(LDFLAGS) $(LDLIBS) $(TARGETS) -o $(TMPDIR)/libopensrf.so
-+	$(CC) -shared -W1 $(LDFLAGS) $(LDLIBS) $(TARGETS) -o $(BUILDDIR)/libopensrf.so
- 
- 
- opensrf.o:	opensrf.c
-@@ -70,4 +69,3 @@
- 
- clean:
- 	/bin/rm -f *.o libopensrf.so opensrf
--
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/objson/Makefile OpenSRF-0.9/src/objson/Makefile
---- OpenSRF-0.9.orig/src/objson/Makefile	2007-06-21 09:19:20.000000000 -0700
-+++ OpenSRF-0.9/src/objson/Makefile	2008-09-28 21:00:08.000000000 -0700
-@@ -27,7 +27,7 @@
- # --------------------------------------------------------------------
- 
- OBJS = utils.o json2xml.o object.o json_parser.o xml2json.o
--CFLAGS += -DSTRICT_JSON_WRITE -DOSRF_DISABLE_MD5 
-+CFLAGS += -DSTRICT_JSON_WRITE -DOSRF_DISABLE_MD5  -I../../include
- TARGETS = object.o json_parser.o json2xml.o xml2json.o ../libopensrf/utils.o ../libopensrf/md5.o
- JSON_INC = ../../include/objson
- 
-@@ -42,11 +42,11 @@
- ../libopensrf/md5.o: ../libopensrf/md5.c ../../include/opensrf/md5.h
- 
- install:
--	cp -r ../../include/objson $(INCLUDEDIR)
--	cp $(TMPDIR)/libobjson.so $(LIBDIR)/libobjson.so
-+	cp -r ../../include/objson $(DESTDIR)$(INCLUDEDIR)
-+	cp $(BUILDDIR)/libobjson.so $(DESTDIR)$(LIBDIR)/libobjson.so
- 
- libobjson.so:	$(TARGETS)
--	$(CC) -shared -W1 $(TARGETS) -o $(TMPDIR)/libobjson.so
-+	$(CC) -shared -W1 $(TARGETS) -o $(BUILDDIR)/libobjson.so
- 
- clean:
- 	/bin/rm -f *.o *.so 
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/router/Makefile OpenSRF-0.9/src/router/Makefile
---- OpenSRF-0.9.orig/src/router/Makefile	2005-10-03 15:19:41.000000000 -0700
-+++ OpenSRF-0.9/src/router/Makefile	2008-09-28 21:00:08.000000000 -0700
-@@ -7,7 +7,7 @@
- #osrf_router
- 
- install: 
--	cp opensrf_router $(BINDIR)
-+	cp opensrf_router $(DESTDIR)$(BINDIR)
- 
- #opensrf_router:	router.o 
- #	$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) router.o -o $@
-diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/srfsh/Makefile OpenSRF-0.9/src/srfsh/Makefile
---- OpenSRF-0.9.orig/src/srfsh/Makefile	2005-09-01 09:15:27.000000000 -0700
-+++ OpenSRF-0.9/src/srfsh/Makefile	2008-09-28 21:00:08.000000000 -0700
-@@ -9,7 +9,7 @@
- srfsh.o:	srfsh.c srfsh.h
- 
- install: 
--	cp srfsh $(BINDIR)
-+	cp srfsh $(DESTDIR)$(BINDIR)
- 
- clean:
- 	/bin/rm -f *.o srfsh
diff --git a/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch
deleted file mode 100644
index e93e6e6f824e..000000000000
--- a/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-- Make OpenSRF parallel-build safe
-- DESTDIR fixups
-- split out install targets to build the apache modules
-- disable perl and apache install targets, will use gentoo tools instead
-- compile fix to osrf_chat.c
-- Hardcode location of osrf_config instead of using a long recursive find statement
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar OpenSRF-1.0.1.orig/Makefile.am OpenSRF-1.0.1/Makefile.am
---- OpenSRF-1.0.1.orig/Makefile.am	2008-10-26 22:10:21.000000000 -0700
-+++ OpenSRF-1.0.1/Makefile.am	2008-12-08 23:44:44.402248471 -0800
-@@ -115,13 +115,13 @@
- 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
-diff -Nuar OpenSRF-1.0.1.orig/src/gateway/Makefile.am OpenSRF-1.0.1/src/gateway/Makefile.am
---- OpenSRF-1.0.1.orig/src/gateway/Makefile.am	2008-08-18 12:14:00.000000000 -0700
-+++ OpenSRF-1.0.1/src/gateway/Makefile.am	2008-12-08 23:44:44.405703486 -0800
-@@ -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.0.1.orig/src/java/Makefile.am OpenSRF-1.0.1/src/java/Makefile.am
---- OpenSRF-1.0.1.orig/src/java/Makefile.am	2008-07-17 11:15:09.000000000 -0700
-+++ OpenSRF-1.0.1/src/java/Makefile.am	2008-12-08 23:44:44.405703486 -0800
-@@ -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.0.1.orig/src/jserver/osrf_chat.c OpenSRF-1.0.1/src/jserver/osrf_chat.c
---- OpenSRF-1.0.1.orig/src/jserver/osrf_chat.c	2008-04-11 07:13:49.000000000 -0700
-+++ OpenSRF-1.0.1/src/jserver/osrf_chat.c	2008-12-08 23:44:44.405703486 -0800
-@@ -18,6 +18,10 @@
- #include <stdio.h>
- #include <time.h>
- 
-+#ifndef HOST_NAME_MAX
-+#define HOST_NAME_MAX 256
-+#endif
-+
- static int osrfChatXMLErrorOcurred = 0;
- 
- /* This is used by code in osrfChatPushData, but that code is
-diff -Nuar OpenSRF-1.0.1.orig/src/libopensrf/Makefile.am OpenSRF-1.0.1/src/libopensrf/Makefile.am
---- OpenSRF-1.0.1.orig/src/libopensrf/Makefile.am	2008-08-07 09:54:56.000000000 -0700
-+++ OpenSRF-1.0.1/src/libopensrf/Makefile.am	2008-12-08 23:44:44.405703486 -0800
-@@ -94,6 +94,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.0.1.orig/src/Makefile.am OpenSRF-1.0.1/src/Makefile.am
---- OpenSRF-1.0.1.orig/src/Makefile.am	2008-11-03 19:04:24.000000000 -0800
-+++ OpenSRF-1.0.1/src/Makefile.am	2008-12-08 23:44:44.405703486 -0800
-@@ -41,12 +41,12 @@
- 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)
--	make install-perl
-+	mkdir -p $(DESTDIR)$(VAR)
-+	mkdir -p $(DESTDIR)$(PID)
-+	mkdir -p $(DESTDIR)$(LOG)
-+	mkdir -p $(DESTDIR)$(SOCK)
-+	mkdir -p $(DESTDIR)$(jsdir)
-+#	$(MAKE) install-perl
- 
- install-exec-hook:
- 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example'
-@@ -59,10 +59,10 @@
- 
- 
- install-perl:
--	cd ./perl && perl Makefile.PL || make -s install-perl-fail
--	make -C perl
--	make -C perl test || make -s install-perl-fail
--	make -C perl install
-+#	cd ./perl && perl Makefile.PL || $(MAKE) -s install-perl-fail
-+#	$(MAKE) -C perl
-+#	$(MAKE) -C perl test || $(MAKE) -s install-perl-fail
-+#	$(MAKE) -C perl install
- 
- install-perl-fail:
- 	echo
-diff -Nuar OpenSRF-1.0.1.orig/src/Makefile.am OpenSRF-1.0.1/src/Makefile.am
---- OpenSRF-1.0.1.orig/src/Makefile.am	2008-12-08 23:55:32.012609493 -0800
-+++ OpenSRF-1.0.1/src/Makefile.am	2008-12-08 23:56:54.739569108 -0800
-@@ -55,7 +55,7 @@
- 	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)/
- 
- 
- install-perl:
-diff -Nuar OpenSRF-1.0.1.orig/Makefile.am OpenSRF-1.0.1/Makefile.am
---- OpenSRF-1.0.1.orig/Makefile.am	2008-12-08 23:57:09.459287812 -0800
-+++ OpenSRF-1.0.1/Makefile.am	2008-12-08 23:58:26.355782021 -0800
-@@ -124,5 +124,5 @@
- 	$(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.0.1/bin/osrf_ctl.sh
---- OpenSRF-1.0.1.orig/bin/osrf_ctl.sh	2008-09-24 20:27:44.000000000 -0700
-+++ OpenSRF-1.0.1/bin/osrf_ctl.sh	2008-12-09 02:25:39.018456228 -0800
-@@ -87,7 +87,8 @@
- 	esac;
- done
- 
--OSRF_CONFIG=`find $BASEDIR -name osrf_config`
-+#OSRF_CONFIG=`find $BASEDIR -name osrf_config`
-+OSRF_CONFIG=/usr/bin/osrf_config
- 
- [ -z "$OPT_CONFIG" ] && OPT_CONFIG=`$OSRF_CONFIG --sysconfdir`/opensrf_core.xml;
- if [ ! -r "$OPT_CONFIG" ]; then