dev-libs/librets: Fixed boost build error and curl ssl error, added support for php 5.5 and updated mono install to use the new mono-env eclass.

5 files changed, 112 insertions, 10 deletions

diff --git a/dev-libs/librets/ChangeLog b/dev-libs/librets/ChangeLog
index 68e013198..c7c8bdf97 100644
--- a/dev-libs/librets/ChangeLog
+++ b/dev-libs/librets/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*librets-1.5.3-r3 (23 Oct 2013)
+
+  23 Oct 2013; Matthew Schultz (mschultz) <mattsch@gmail.com>
+  -librets-1.5.3-r2.ebuild, +librets-1.5.3-r3.ebuild,
+  +files/librets-1.5.3-boost.patch, +files/librets-1.5.3-curl.patch:
+  Fixed boost build error and curl ssl error, added support for php 5.5 and
+  updated mono install to use the new mono-env eclass.
+
   06 Aug 2013; Julian Ospald <hasufell@gentoo.org> librets-1.5.3-r2.ebuild:
   remove deprecated ruby target ruby_targets_ree18
 
diff --git a/dev-libs/librets/Manifest b/dev-libs/librets/Manifest
index 9fe54de6d..3f8a128eb 100644
--- a/dev-libs/librets/Manifest
+++ b/dev-libs/librets/Manifest
@@ -1,8 +1,10 @@
+AUX librets-1.5.3-boost.patch 2060 SHA256 fb4697cc76e035d68f315be1fbd8ae1b6aff63b73744485b5da15ed47345c2b3 SHA512 d5a8052cacf6d1b43e213f8effcd8bedd33be98dbfc0512057d23708c4c6577681159a61f8ec3c76d187182fa5260334fbe75475aea883cab614d0416eb22c2c WHIRLPOOL 941a27db2defa3020d353dbe34405caf129582636492179cebd3535df4a22ac2b5b33eae891ad4b1da8e5a5bfa7d25e48329001d5be8cf1b23bbe4ece7be81bb
 AUX librets-1.5.3-build.patch 4296 SHA256 9b82f3f3e00ac015f20aab181f023cc73bdfbcea66d9e3189d6e8012a6edf3e0 SHA512 1c425c61f780989747f0f9cee14fccd83c32b2805858f3640eb42191d13595ca04552445c362e1f7b6e31653bd6a69e97f7d42327d00c6f32def819d13fc4559 WHIRLPOOL f6743795af35df333d20945f6232e01f3e0990a2134d249d3114c393b39c4abe9582752f9d626fb38253505f280744e551f4ad75b53929ad2c78a7375479fa31
+AUX librets-1.5.3-curl.patch 740 SHA256 f40a24265fc94af4d883ba0d80a91df1f22c16ee8c6c0e2fa0d2ba1f208b87b9 SHA512 8cd17e39473b3dc74e3d187e7de6d520596b6970e31916fea8a050550b026e10e0df730e01b24b483f943af8b43384be2f66d46bd40767cdea91a9a4543eb09f WHIRLPOOL d57ed24d939268c02ddf39995c2dd60064fb386e2951757bc2ea01367ebf427c8d0ecfc20ecce82df5545a6ae2b570f87a80e05decb9d43d4de9ac6ffe846de6
 AUX librets-1.5.3-extconf.rb.patch 874 SHA256 f06f46d826e87cd6f905d76c021b49e0983b31a696df0e4fc6805524f5dfffa9 SHA512 724852d96ea9d2b6af69201767dd8e7d5d859d8d7afdefd7945d3ac99303360bd14b3ee2339d967366bc6838294da7c228844137e02b49872cbdb41d9ac3895d WHIRLPOOL 06b654af7a9d5571d9fd6be39ae30dfc7b7d3f89a8709c02555f56da308b8f937cd24b76228ad8c35ce6e850b4066979420a2081ecfdb1c263cbaebdfc5cacd2
 AUX librets-1.5.3-java.mk.patch 620 SHA256 1e18e6bf3c4b1cf3fc41ede276ee7f344fae0ee39a9e5683ab95df8926573adf SHA512 8ee91e24567034b44fa88e04026c50f3f91ec7849f604b03d6e2bf3d013200eb62f08ab2ebd4a6bb4a6c8ee52841ee8f40b3995cc47efa2462a91103d29e0127 WHIRLPOOL 62f3b4e779045c05bd1d81e3f0584cae76d8fa506a7f1f920b1df285a7671d507861dbaa4a649ecd9b742ee057db8fd7f326df9c6e5991adc0cd91b86c96e81e
 AUX librets.snk 596 SHA256 6bf3c8c92df3bda29091d32608e402132516553b1591c9665f234305ed4f6d6f SHA512 6f3e9eecf17c30c0649e262d99d663c6604ded3bc51f2488b5518f710addc767cb0a045d944e386ad01054f2da101c014982950bca3d951d9eff3d50591b5b07 WHIRLPOOL fb319f74336e0058c5dfc7d8e819fc042a4673b5409b9bebcdb5c431be4e06498f876f874cd884d3108b030e33a53f6840ea4335158188d6f12fdd9cbee25a49
 DIST librets-1.5.3.tar.gz 1442794 SHA256 d878b9dad7e31edfb560a786f2d23f37b67af42a96bc4848049e5b9083b9648a SHA512 035477f7ca8dbada97ab6729dc93637006714c407368f750ff5529f5ac01e6d1c7d99a385344f065eab939d338aa6a8cffefc1b72d56dc40228c45877afdbe14 WHIRLPOOL 39ac2910a33330b84695571fcbda9c2bc9bc5fdf75425f4bee72981419eb83623dea8e38d980ecd73b549dd1593be1c56033a0c18c491add55bf2fa57fc970a4
-EBUILD librets-1.5.3-r2.ebuild 7962 SHA256 9b0093d5975a503be6c8dc23ff8d33d4a0e6338bd34b5692d3ba19d24c80e8d8 SHA512 8442b87f8e211a2adf180915bf3f46a5cc23671b1d04e11b6591037a3b10a6ddc3bc8fe4679a65a90771a7346e6837050052e5b723f16dde15a22c54232bfc09 WHIRLPOOL b7f9ae2bc65fd1aa48dc4c77a8ba224def2a6a8e9160fa453413185b21497c7170f4a5da039725581022972a671988aa8ce20d4c7c5d25ac3c49980149f8e9f3
-MISC ChangeLog 3756 SHA256 d08791958306c487d26b423b0dce292ad0ccccb971fe20b16db1143521d9b698 SHA512 297712776f19afddf62104020103ae06d5e69e32cb074ab94637249550fb1edf0208529c5e06d1e3fc3961eef30ebe30f738c46cefe4fa532438218e8f1a23a0 WHIRLPOOL edd29e20b3e2005869f6c517072bfad6b67b9f3d3d7ad020b761a511bb3df0dea4c34d089d19ffbbae1cb7f6506fcdde6c210e1034af8e8c3d7453ce90485bf4
+EBUILD librets-1.5.3-r3.ebuild 8167 SHA256 6eacf2b1b39595549a2ba55b07d302e362c5f917d32b2620c9d57947f8791c2a SHA512 500a5b5280c90156c2e60110b53a84e84b92f9909972928d6991bd97c27b29a14acf391dc5a5fe7b8dbf61150d6e51b18def23f577ca17b452e4b3b55974e3e0 WHIRLPOOL 3864ba226ed1950420cbe384beb72a2b0f97438b006d3dbab4234d336dd59d9a66f18c49bd9134dc8740195a284cb52cf03e25cbe1769605e1c77fae3c11c3f1
+MISC ChangeLog 4106 SHA256 b01165124a1c0f6272c8841f8d81cf44042c6ec0a55c44b6681c71a7435fade2 SHA512 a9029ff84ea7aa40dbc1754e340408a2decf5d47a39a4a00cfea07b7d5f65a4ffac49fa312382f7f7921ecb047d6e08ee81c0720d93cee9cf01473a6b705b4a2 WHIRLPOOL 7a13763be4148eefb169bf2171ff1ec0f13c2fe77e5259f61b434ae5524dee77e3b1ff1ddc1ff3100ee308e3f93db4d032598c2392639a7547801f0457541338
 MISC metadata.xml 774 SHA256 5b2aeaf3434f0c6ca946cb530fc822c8d54abde507e47eee513c473680126ffa SHA512 e0330367997c697881dd10980ad7b2b41700e65ad1cf8ddfc3fd879d933da3e3cfde676e35b645fb86550a32ec02702bc9a007c816446e7b1fbc3cd47fe0734c WHIRLPOOL f61f90404603e1162ce2917e641c1e66a566e10fef02c0e46e63f5210a50c0d8ce6ef438551ef5160b5037537456dc019260e3f3a16b5aae5bfccd1d5699436a
diff --git a/dev-libs/librets/files/librets-1.5.3-boost.patch b/dev-libs/librets/files/librets-1.5.3-boost.patch
new file mode 100644
index 000000000..8e357dc14
--- /dev/null
+++ b/dev-libs/librets/files/librets-1.5.3-boost.patch
@@ -0,0 +1,68 @@
+Fixes boost filesystem version detection error when compiling
+
+Index: project/librets/include/librets/RetsExceptionContext.h
+===================================================================
+--- project/librets/include/librets/RetsExceptionContext.h	(revision 1552)
++++ project/librets/include/librets/RetsExceptionContext.h	(revision 1553)
+@@ -22,6 +22,7 @@
+  */
+ /// @cond MAINTAINER
+ #include <string>
++#include <boost/filesystem/path.hpp>
+ 
+ namespace librets {
+ /**
+@@ -36,12 +37,12 @@
+     
+     bool IsValid() const throw();
+     
+-    std::string GetFileName() const throw();
++    boost::filesystem::path GetFileName() const throw();
+     
+     int GetLineNumber() const throw();
+     
+   private:
+-        std::string mFileName;
++    boost::filesystem::path mFileName;
+     int mLineNumber;
+ };
+ 
+Index: project/librets/src/RetsExceptionContext.cpp
+===================================================================
+--- project/librets/src/RetsExceptionContext.cpp	(revision 1552)
++++ project/librets/src/RetsExceptionContext.cpp	(revision 1553)
+@@ -14,14 +14,12 @@
+  * both the above copyright notice(s) and this permission notice
+  * appear in supporting documentation.
+  */
+-#define BOOST_FILESYSTEM_VERSION 2
+ #include <boost/filesystem/path.hpp>
+ #include "librets/RetsExceptionContext.h"
+ 
+ using namespace librets;
+ using namespace std;
+ 
+-#undef BOOST_FILESYSTEM_VERSION
+ #define BOOST_FILESYSTEM_VERSION 3
+ namespace fs = boost::filesystem;
+ 
+@@ -43,7 +41,7 @@
+     return (!mFileName.empty());
+ }
+ 
+-string RetsExceptionContext::GetFileName() const throw()
++fs::path RetsExceptionContext::GetFileName() const throw()
+ {
+     return mFileName;
+ }
+Index: project/librets/src/RetsReplyException.cpp
+===================================================================
+--- project/librets/src/RetsReplyException.cpp	(revision 1552)
++++ project/librets/src/RetsReplyException.cpp	(revision 1553)
+@@ -52,4 +52,4 @@
+ string RetsReplyException::GetExtendedMeaning() const throw()
+ {
+     return mExtendedMeaning;
+-}
+\ No newline at end of file
++}
diff --git a/dev-libs/librets/files/librets-1.5.3-curl.patch b/dev-libs/librets/files/librets-1.5.3-curl.patch
new file mode 100644
index 000000000..05e52b16e
--- /dev/null
+++ b/dev-libs/librets/files/librets-1.5.3-curl.patch
@@ -0,0 +1,17 @@
+Fixes bug: Could not Verify SSL Host: curl error #43
+
+Index: project/librets/src/CurlEasy.cpp
+===================================================================
+--- project/librets/src/CurlEasy.cpp	(revision 1308)
++++ project/librets/src/CurlEasy.cpp	(revision 1556)
+@@ -209,8 +209,8 @@
+     if (verify)
+         verifies    = 2;
+ 
+-    CurlAssert(curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, verify), "Verify SSL Peer");
+-    CurlAssert(curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYHOST, verify), "Verify SSL Host");
++    CurlAssert(curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, verifies), "Verify SSL Peer");
++    CurlAssert(curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYHOST, verifies), "Verify SSL Host");
+ }
+ 
+ void CurlEasy::Perform()
diff --git a/dev-libs/librets/librets-1.5.3-r2.ebuild b/dev-libs/librets/librets-1.5.3-r3.ebuild
index b6c3b223f..4e2c15f1f 100644
--- a/dev-libs/librets/librets-1.5.3-r2.ebuild
+++ b/dev-libs/librets/librets-1.5.3-r3.ebuild
@@ -7,14 +7,14 @@ EAPI="5"
 PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="librets"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-3 php5-4"
+USE_PHP="php5-3 php5-4 php5-5"
 
 PYTHON_COMPAT=( python2_{6,7} )
 
 USE_RUBY="ruby18 ruby19"
 RUBY_OPTIONAL="yes"
 
-inherit autotools eutils java-pkg-opt-2 mono perl-module php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
+inherit autotools eutils java-pkg-opt-2 mono-env perl-module php-ext-source-r2 python-r1 ruby-ng toolchain-funcs
 
 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/"
@@ -48,7 +48,6 @@ RDEPEND=">=dev-libs/boost-1.46
 	python? ( ${SWIG_RDEPEND} ${PYTHON_DEPS} )
 	ruby? ( $(ruby_implementations_depend) ${SWIG_RDEPEND} )"
 
-# An upstream bug prevents the php extension from building with swig >= 2.0.5
 DEPEND="java? ( >=dev-lang/swig-1.3.40-r1 )
 	mono? ( >=dev-lang/swig-1.3.40-r1 )
 	php? ( dev-lang/php[-threads] >=dev-lang/swig-1.3.40-r1 )
@@ -94,6 +93,7 @@ my_ruby-move_swig_build_to_impl_dir() {
 
 pkg_setup() {
 	use java && java-pkg-opt-2_pkg_setup
+	use mono && mono-env_pkg_setup
 	use perl && perl-module_pkg_setup
 	use ruby && ruby-ng_pkg_setup
 }
@@ -104,9 +104,12 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-extconf.rb.patch
-	epatch "${FILESDIR}"/${P}-java.mk.patch
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-extconf.rb.patch \
+		"${FILESDIR}"/${P}-java.mk.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-curl.patch \
+		"${FILESDIR}"/${P}-boost.patch
+	epatch_user
 	eautoreconf
 
 	# Change the path to librets-config-inplace for python slotted build support
@@ -119,7 +122,6 @@ src_prepare() {
 
 src_configure() {
 	local myphpprefix
-
 	if use php; then
 		# Enable php extension when it finds the current selected slot
 		myphpprefix="${PHPPREFIX}/include"
@@ -242,7 +244,12 @@ src_install() {
 	use ruby && ruby-ng_src_install
 
 	if use mono; then
-		egacinstall "${S}"/build/swig/csharp/${PN}-dotnet.dll
+		local dll="${S}"/build/swig/csharp/${PN}-dotnet.dll
+		gacutil -i "${dll}" \
+			-root "${ED}"/usr/$(get_libdir) \
+			-gacdir /usr/$(get_libdir) \
+			-package ${PN} \
+			|| die "installing ${dll} into the Global Assembly Cache failed"
 	fi
 
 	if use python; then