dev-libs/librets: Version bump.

svn path=/sunrise/; revision=12839

8 files changed, 26 insertions, 196 deletions

diff --git a/dev-libs/librets/ChangeLog b/dev-libs/librets/ChangeLog
index 91b731738..12266db1f 100644
--- a/dev-libs/librets/ChangeLog
+++ b/dev-libs/librets/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*librets-1.5.3 (23 Mar 2012)
+
+  23 Mar 2012; Matthew Schultz (mschultz) <mattsch@gmail.com>
+  -librets-1.5.2-r4.ebuild, +librets-1.5.3.ebuild, -files/dotnet.patch,
+  -files/perl.mk.patch, -files/python.mk.patch, -files/swig.m4.patch,
+  files/java.mk.patch:
+  Version bump.
+
 *librets-1.5.2-r4 (12 Mar 2012)
 
   12 Mar 2012; Matthew Schultz (mschultz) <mattsch@gmail.com>
diff --git a/dev-libs/librets/Manifest b/dev-libs/librets/Manifest
index 3dbb4654a..837452aa8 100644
--- a/dev-libs/librets/Manifest
+++ b/dev-libs/librets/Manifest
@@ -1,11 +1,7 @@
-AUX dotnet.patch 3455 RMD160 1aa58621db217a576427c13dc6b18d31bb330b71 SHA1 727980aec242d70f9c8caf8309d11dd41be9de53 SHA256 8ead4f481df2ef5f0b0dbe7b235bf2d09dfef2de8090611122a9606062028f9e
 AUX extconf.rb.patch 773 RMD160 ff2cf3ceb431f7bdbf7ae48bc6695b796f953a20 SHA1 8ee0f585c4e4524c2531002c5656798ab2197c74 SHA256 f21d12ddd90316592fa8fb0d7575bb619051727aac1025df5c9c243064f80e29
-AUX java.mk.patch 783 RMD160 1ba38cbea393c1646f1517665c515402a3834135 SHA1 049e24d2240fe8b3c22325f4e476afa4f901b063 SHA256 9709b787b2c55c9c390a22677fbe15d821beb588e6ccedb48e1277fff47345de
+AUX java.mk.patch 527 RMD160 c02644408575d08cfef75c530efb06a081c5a407 SHA1 203f3bf73dbedc9309faab83b681b69ae925236a SHA256 a3ec350548388967b91b489266be2d24b2ad8a0e9fb4f63316ce5e3e9ceeb9ab
 AUX librets.snk 596 RMD160 437c0db04bccb0da482d0e6c9dc38f21757ce17b SHA1 aec4dcf1e29aa0f8519e710f19a5bac308566bfd SHA256 6bf3c8c92df3bda29091d32608e402132516553b1591c9665f234305ed4f6d6f
-AUX perl.mk.patch 1088 RMD160 7054d8bb712814434e3978c69c36ff267c102a5a SHA1 660fa197034f316aa7523a17c2a0ea065876e975 SHA256 200c4fa5f034478b406892fbac17156655be49164f46dcaba094e13745993198
-AUX python.mk.patch 501 RMD160 611578ad08ee095d4364e538e6b69e4f5727d401 SHA1 803f4678b974d87008e772115d09034fb31bb8fe SHA256 8ba69a842499dcfeaaba25ac8fb9f4723d7243293b7fba7734510bca47eb89cb
-AUX swig.m4.patch 462 RMD160 d0e5b1f14b78d514a7bcee9e052e433645a02162 SHA1 6003ea54742da9aff9b9a320643819ad34f1cf7b SHA256 aa217a9442f967196027ef589e114eeca2d5583506b69eeae72dd9107f8594d1
-DIST librets-1.5.2.tar.gz 1157546 RMD160 154a4fff9bbf994b739a1d30b3bb5eed9ecdd5d3 SHA1 cc856a41bc8120865937d199c918542bf3d82a95 SHA256 5d9c32eefd1a20b90c58ef117010768d8161c56ee0138efa4dd8b1ab82a433ce
-EBUILD librets-1.5.2-r4.ebuild 8524 RMD160 7545678d9108ba47e99a1a47b01751e67e080d07 SHA1 12e105d4a707a733022cda6bcb9072a663012b76 SHA256 8e2f2734de65326c47b0441f630d38e51df3d7efb7749c602061e649e36386f5
-MISC ChangeLog 2529 RMD160 226646e07f0337a4afb855022dc30b06c433066b SHA1 517a66626b2c398b566daa6fa5b05236203fe797 SHA256 b3a36c845e1366b7e1703a5e6405fcec712ed838a584a0b330f67c73e4124071
+DIST librets-1.5.3.tar.gz 1442794 RMD160 30619eaa62325d25d268c5f37dd2a8c536363a13 SHA1 2de4d9e9cb26533eb0a9a090b3354a70ed3c41ec SHA256 d878b9dad7e31edfb560a786f2d23f37b67af42a96bc4848049e5b9083b9648a
+EBUILD librets-1.5.3.ebuild 8175 RMD160 4a4ad34bd99b90f89762b0c034bacc55da15daa1 SHA1 bf829d940f5d6997550ff3e29bd957e2abd9a9ce SHA256 0b674074532fbf659651de029b20e97f1dc69d90f4c41197ef30c17809600f1a
+MISC ChangeLog 2803 RMD160 bb47b36702764f00d5e4ea2613210adc8ef03ba1 SHA1 4533a83295d38573e34b6fa9f0d718c83576db1f SHA256 19d43b2735a3f1903602897cd5dded0a9c2beaa4db6f6233bf9e5a0b74cef6cf
 MISC metadata.xml 830 RMD160 50a58e8cd7c132469fd2b693be4eb9bda93136f1 SHA1 83ab36379a556b91023d0a2b5f15fb2109f4eb3c SHA256 05f6e383376e2d49d18dfd40738f55ba069dee9f697829619ba9a3d0e6693748
diff --git a/dev-libs/librets/files/dotnet.patch b/dev-libs/librets/files/dotnet.patch
deleted file mode 100644
index 882db8b0c..000000000
--- a/dev-libs/librets/files/dotnet.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: Makefile.in
-===================================================================
---- Makefile.in	(revision 1523)
-+++ Makefile.in	(revision 1524)
-@@ -44,6 +44,7 @@
- HAVE_DOTNET=@HAVE_DOTNET@
- CSC=@CSC@
- MCS=@MCS@
-+SNK_FILE=@SNK_FILE@
- HAVE_PERL=@HAVE_PERL@
- PERL=@PERL@
- HAVE_PHP=@HAVE_PHP@
-Index: project/build/ac-macros/swig.m4
-===================================================================
---- project/build/ac-macros/swig.m4	(revision 1523)
-+++ project/build/ac-macros/swig.m4	(revision 1524)
-@@ -21,6 +21,7 @@
-     HAVE_RUBY=0
-     JAVA_INCLUDES=
-     USE_SWIG_BINDINGS=
-+    SNK_FILE=
-     my_have_java=no
-     my_have_dotnet=no
-     my_have_perl=no
-@@ -63,6 +64,14 @@
-             AC_CHECK_PROG(MCS, mcs, mcs, no)
-             AC_CHECK_PROG(GMCS, gmcs, gmcs, no)
-             AC_CHECK_PROG(CSC, csc, csc, no)
-+            AC_ARG_WITH([snk-file], 
-+                AC_HELP_STRING(
-+                    [--with-snk-file=PATH],
-+                    [strong name key file to sign the .NET dll.
-+                ]),
-+                SNK_FILE="$withval",
-+                SNK_FILE="")
-+
-             generics=`expr \
-                 $ver_major \> 1 \| \
-                 $ver_major \= 1 \& \
-@@ -236,6 +245,7 @@
-   AC_SUBST(HAVE_DOTNET)
-   AC_SUBST(CSC)
-   AC_SUBST(MCS)
-+  AC_SUBST(SNK_FILE)
-   AC_SUBST(HAVE_PERL)
-   AC_SUBST(HAVE_PHP)
-   AC_SUBST(PHP)
-Index: project/build/dotnet.mk
-===================================================================
---- project/build/dotnet.mk	(revision 1523)
-+++ project/build/dotnet.mk	(revision 1524)
-@@ -6,7 +6,11 @@
- 				${DOTNET_UNMANAGED_DLL}				\
- 				${DOTNET_DEMO_EXE}
- 
--DOTNET_BUILD		= ${DOTNET_WRAP}  ${DOTNET_ALL}
-+ifeq (${SWIG_OSNAME}, linux)
-+DOTNET_BUILD           = ${DOTNET_WRAP}
-+else
-+DOTNET_BUILD           = ${DOTNET_WRAP}  ${DOTNET_ALL}
-+endif
- DOTNET_CXX_FLAGS	= -fPIC `${SWIG_LIBRETS_CONFIG} --cflags`
- DOTNET_DEMO_EXE		= ${DOTNET_GETOBJECT_EXE}				\
- 				${DOTNET_INTERLEAVED_EXE}			\
-@@ -90,8 +94,14 @@
- # Not Windows/MinGW
- #
- 
-+
-+ifeq (${strip ${SNK_FILE}},)
- ${DOTNET_MANAGED_DLL}:	${DOTNET_UNMANAGED_DLL} ${DOTNET_MANAGED_SRC}
- 	${MCS} -target:library -out:${DOTNET_MANAGED_DLL} ${DOTNET_PLATFORM} ${DOTNET_MANAGED_SRC}
-+else
-+${DOTNET_MANAGED_DLL}:	${DOTNET_UNMANAGED_DLL} ${DOTNET_MANAGED_SRC}
-+	${MCS} -target:library -keyfile:${SNK_FILE} -out:${DOTNET_MANAGED_DLL} ${DOTNET_PLATFORM} ${DOTNET_MANAGED_SRC}
-+endif
- 
- ${DOTNET_GETOBJECT_EXE}:	${DOTNET_GETOBJECT_SRC}
- 	${MCS} -r:${DOTNET_MANAGED_DLL} ${DOTNET_PLATFORM} -out:${DOTNET_GETOBJECT_EXE} ${DOTNET_GETOBJECT_SRC}
-@@ -126,12 +136,21 @@
- # Windows/MinGW
- #
- 
-+ifeq (${strip ${SNK_FILE}},)
- ${DOTNET_MANAGED_DLL}:	${DOTNET_UNMANAGED_DLL} ${DOTNET_MANAGED_SRC}
- 	${CSC} -target:library \
- 		-platform:${TARGET_CPU} \
-                 -out:${shell echo ${DOTNET_MANAGED_DLL} | ${BACKSLASH}} \
-                 ${shell echo ${DOTNET_PLATFORM} | ${BACKSLASH}} \
-                 ${shell echo ${DOTNET_MANAGED_SRC} | ${BACKSLASH}}
-+else
-+${DOTNET_MANAGED_DLL}:  ${DOTNET_UNMANAGED_DLL} ${DOTNET_MANAGED_SRC}
-+	${CSC} -target:library -keyfile:${SNK_FILE} \
-+		-platform:${TARGET_CPU} \
-+                -out:${shell echo ${DOTNET_MANAGED_DLL} | ${BACKSLASH}} \
-+                ${shell echo ${DOTNET_PLATFORM} | ${BACKSLASH}} \
-+                ${shell echo ${DOTNET_MANAGED_SRC} | ${BACKSLASH}}
-+endif
- 
- ${DOTNET_GETOBJECT_EXE}:	${DOTNET_GETOBJECT_SRC}
- 	${CSC} -r:${shell echo ${DOTNET_MANAGED_DLL} | ${BACKSLASH}} \
diff --git a/dev-libs/librets/files/java.mk.patch b/dev-libs/librets/files/java.mk.patch
index b391b48dc..55dda702d 100644
--- a/dev-libs/librets/files/java.mk.patch
+++ b/dev-libs/librets/files/java.mk.patch
@@ -1,26 +1,16 @@
---- project/build/java.mk.old	2011-06-25 13:50:54.074226602 -0500
-+++ project/build/java.mk	2011-06-25 13:52:07.454837879 -0500
+Index: project/build/java.mk
+===================================================================
+--- project/build/java.mk	(revision 1551)
++++ project/build/java.mk	(working copy)
 @@ -2,7 +2,11 @@
  # java of swig
  #
  
 +ifeq (${SWIG_OSNAME}, linux)
-+JAVA_BUILD              = ${JAVA_DLL}
++JAVA_BUILD              = ${JAVA_DLL} ${JAVA_OBJ_DIR}/${JAVA_JAR}
 +else
  JAVA_BUILD		= ${JAVA_DLL} ${JAVA_OBJ_DIR}/${JAVA_JAR} ${JAVA_EXAMPLES_CLASSES}
 +endif
  
- JAVA_BRIDGE		= ${JAVA_SRC_DIR}/CppInputStream.java
- # delete the next line to enable the streams prototype for Java
-@@ -24,7 +28,11 @@
- JAVA_DYNAMICLINK	= ${SWIG_LINK}
- else
- JAVA_CLASSPATH		= ${JAVA_OBJ_DIR}/${JAVA_JAR}
-+ifeq (${SWIG_OSNAME}, linux)
-+JAVA_DLL                = ${JAVA_OBJ_DIR}/librets.${DLL}
-+else
- JAVA_DLL		= ${JAVA_OBJ_DIR}/liblibrets.${DLL}
-+endif
- ifeq (${SWIG_OSNAME}, MSWin32)
- JAVA_DLL		= ${JAVA_OBJ_DIR}/librets.${DLL}
- endif
+ # Include/combine the follwoing source into the actual JAVA_BRIDGE
+ # line to enable the streams prototype for Java
diff --git a/dev-libs/librets/files/perl.mk.patch b/dev-libs/librets/files/perl.mk.patch
deleted file mode 100644
index 7a2a75d59..000000000
--- a/dev-libs/librets/files/perl.mk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: project/build/perl.mk
-===================================================================
---- project/build/perl.mk	(revision 1513)
-+++ project/build/perl.mk	(revision 1520)
-@@ -5,6 +5,7 @@
- PERL_BUILD		= ${PERL_DLL}
- 
- PERL_CFLAGS		= `${top_srcdir}/librets-config-inplace --cflags`
-+PERL_DLL_DIR		= ${PERL_OBJ_DIR}/blib/arch/auto/librets
- PERL_LIB		= ${shell perl -e 'use Config; print $$Config{libperl};'}
- PERL_INSTALL		= perl_install
- PERL_LDFLAGS		= `${top_srcdir}/librets-config-inplace --libs`
-@@ -27,6 +28,8 @@
- 
- ifneq (${SWIG_OSNAME}, MSWin32)
- 
-+PERL_DLL		= ${PERL_DLL_DIR}/librets.so
-+
- ${PERL_OBJ_DIR}/${PERL_MAKEFILE_PL}: ${PERL_SRC_DIR}/${PERL_MAKEFILE_PL}
- 	cp ${PERL_SRC_DIR}/${PERL_MAKEFILE_PL} ${PERL_OBJ_DIR}/${PERL_MAKEFILE_PL}
- 	cp ${PERL_SRC_DIR}/${PERL_MANIFEST} ${PERL_OBJ_DIR}
-@@ -60,7 +63,6 @@
-                                 $$libdir=~s/\\/\//g;print $$libdir;'}/CORE
- endif
- 
--PERL_DLL_DIR		= ${PERL_OBJ_DIR}/blib/arch/auto/librets
- PERL_DLL		= ${PERL_DLL_DIR}/librets.${DLL}
- PERL_INCLUDES		= ${PERL_LIB_DIR}
- PERL_MAKEFILE_PL_MINGW	= Makefile.mingw
diff --git a/dev-libs/librets/files/python.mk.patch b/dev-libs/librets/files/python.mk.patch
deleted file mode 100644
index 3181c2785..000000000
--- a/dev-libs/librets/files/python.mk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: project/build/python.mk
-===================================================================
---- project/build/python.mk	(revision 1522)
-+++ project/build/python.mk	(revision 1523)
-@@ -19,7 +19,7 @@
- ${PYTHON_DLL}: ${PYTHON_WRAP} ${LIBRETS_LIB}
- 	cd ${PYTHON_OBJ_DIR} ; \
- 	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
--	${PYTHON} setup.py build --build-lib=. 
-+	${PYTHON} setup.py build  
- else
- PYTHON_CXX_FLAGS	= -mcygwin -mdll \
- 				`${SWIG_LIBRETS_CONFIG} --cflags`
diff --git a/dev-libs/librets/files/swig.m4.patch b/dev-libs/librets/files/swig.m4.patch
deleted file mode 100644
index 0a8332a77..000000000
--- a/dev-libs/librets/files/swig.m4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: project/build/ac-macros/swig.m4
-===================================================================
---- project/build/ac-macros/swig.m4	(revision 1501)
-+++ project/build/ac-macros/swig.m4	(revision 1522)
-@@ -72,7 +72,7 @@
- 
-             if test "$generics" = "1"; then
-                 if test "$GMCS" != "no"; then
--                    MCS=GMCS
-+                    MCS=$GMCS
-                 fi
-             fi
-             if test "$MCS" != "no"; then
diff --git a/dev-libs/librets/librets-1.5.2-r4.ebuild b/dev-libs/librets/librets-1.5.3.ebuild
index ed87327b5..c9b1a36bf 100644
--- a/dev-libs/librets/librets-1.5.2-r4.ebuild
+++ b/dev-libs/librets/librets-1.5.3.ebuild
@@ -18,7 +18,7 @@ RUBY_OPTIONAL="yes"
 
 inherit distutils eutils java-pkg-opt-2 mono multilib perl-module php-ext-source-r2 ruby-ng versionator
 
-DESCRIPTION="A library that implements the RETS 1.7, RETS 1.5 and 1.0 standards"
+DESCRIPTION="A library that implements the RETS 1.8, 1.7, 1.5 and 1.0 standards"
 HOMEPAGE="http://www.crt.realtors.org/projects/rets/librets/"
 SRC_URI="http://www.crt.realtors.org/projects/rets/${PN}/files/${P}.tar.gz"
 
@@ -26,7 +26,7 @@ LICENSE="BSD-NAR"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc java mono perl php python ruby sql-compiler threads"
-# Enabling threads for perl, php, python or ruby causes segmentation faults.
+# Enabling threads for perl, php, python or ruby causes segmentation faults in cli scripts but not through apache
 REQUIRED_USE="perl? ( !threads )
 	php? ( !threads )
 	python? ( !threads )
@@ -44,9 +44,9 @@ for i in java perl php python ruby; do
 done
 
 RDEPEND="
-	<dev-libs/boost-1.46
+	>=dev-libs/boost-1.46
 	dev-libs/expat
-	<dev-util/boost-build-1.46
+	>=dev-util/boost-build-1.46
 	java? ( >=virtual/jdk-1.6.0 )
 	mono? ( dev-lang/mono )
 	net-misc/curl
@@ -71,7 +71,7 @@ _php-ext-source-r2_src_install() {
 		php_init_slot_env ${slot}
 		# Let's put the default module away
 		insinto "${EXT_DIR}"
-		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
 	done
 	php-ext-source-r2_createinifiles
 }
@@ -109,19 +109,11 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Upstream patch to allow perl to be built in the compile stage
-	epatch "${FILESDIR}"/perl.mk.patch
-	# Patch to fix java errors and allow compilation
+	# Patch to fix compilation errors by removing the java exmaples target when building for java
 	epatch "${FILESDIR}"/java.mk.patch
-	# Patch to stop python from building the extension again during install
-	epatch "${FILESDIR}"/python.mk.patch
-	# Upstream patch to allow dotnet binding to build
-	epatch "${FILESDIR}"/swig.m4.patch
-	# Patch to allow dotnet binding to build and set snk key file
-	epatch "${FILESDIR}"/dotnet.patch
 	# Patch to allow the ruby extension to compile when multiple versions of boost are installed
 	epatch "${FILESDIR}"/extconf.rb.patch
-	local myboostpackage=$(best_version "<dev-libs/boost-1.46")
+	local myboostpackage=$(best_version ">=dev-libs/boost-1.46")
 	local myboostpackagever=${myboostpackage/*boost-/}
 	local myboostver=$(get_version_component_range 1-2 ${myboostpackagever})
 	local myboostslot=$(replace_version_separator 1 _ ${myboostver})