dev-libs/librets: Added support for php 5.4.

6 files changed, 24 insertions, 16 deletions

diff --git a/dev-libs/librets/ChangeLog b/dev-libs/librets/ChangeLog
index 6deb58fa2..1067ca97a 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-r2 (13 Mar 2013)
+
+  13 Mar 2013; Matthew Schultz (mschultz) <mattsch@gmail.com>
+  -librets-1.5.3-r1.ebuild, +librets-1.5.3-r2.ebuild,
+  files/librets-1.5.3-build.patch, files/librets-1.5.3-extconf.rb.patch,
+  files/librets-1.5.3-java.mk.patch:
+  Added support for php 5.4.
+
 *librets-1.5.3-r1 (02 Jan 2013)
 
   02 Jan 2013; Matthew Schultz (mschultz) <mattsch@gmail.com>
diff --git a/dev-libs/librets/Manifest b/dev-libs/librets/Manifest
index d506020ba..169eb5665 100644
--- a/dev-libs/librets/Manifest
+++ b/dev-libs/librets/Manifest
@@ -1,8 +1,8 @@
-AUX librets-1.5.3-build.patch 4244 SHA256 9b1bbf043b5866e1e390a18f382babf7f1d262ed025c691d763018fe8950d6b6 SHA512 90a0da8c754e5185530bef54d420db9580588a40da120498b8d4c32b39618e8024953e457b9cd0b92544a224e3c2946844200f39dbff57d2e67075dbc64c5858 WHIRLPOOL d02c486b607c089d7c72b4dbd977af8c1784b072df3ce22e0762d09428d9e72a51830114ca945c842561057dbc81bf538812e161721c543efbf8fd1a4911f005
-AUX librets-1.5.3-extconf.rb.patch 773 SHA256 f21d12ddd90316592fa8fb0d7575bb619051727aac1025df5c9c243064f80e29 SHA512 646831e751863a9ced415b6c559cc24b42a369cbcdaeea225d0a46d7d07bc79c08cc64f87b34e504a88db671d7b6d05c2becb751e03c22061decf90e072f644c WHIRLPOOL 4ad71a252bbfc75827bfac986088c048fc74d037dc92a2060d84b9117b6f109c5a64063c859e3248a4c0d16eaaba22b1f1b64f0c8d81c2bbb51d4e58b17d2dfe
-AUX librets-1.5.3-java.mk.patch 527 SHA256 a3ec350548388967b91b489266be2d24b2ad8a0e9fb4f63316ce5e3e9ceeb9ab SHA512 1b752dd35e8d5032ed5058d8a46e84606b409e29596d69a69b84546952e106d86fa95ee21fb1d3abcfbc4a6b4119ac766fe576767859e73e1cda4b1f4ad22f55 WHIRLPOOL c6799d5c0ec4c18a27fe0ed1c3fa9ef092571aada24dc2c0c2cad21db1964649c180f50be431f5dfe649c6ec8f6a5d3f556ff851a38c64e295b23fe250d2f02f
+AUX librets-1.5.3-build.patch 4296 SHA256 9b82f3f3e00ac015f20aab181f023cc73bdfbcea66d9e3189d6e8012a6edf3e0 SHA512 1c425c61f780989747f0f9cee14fccd83c32b2805858f3640eb42191d13595ca04552445c362e1f7b6e31653bd6a69e97f7d42327d00c6f32def819d13fc4559 WHIRLPOOL f6743795af35df333d20945f6232e01f3e0990a2134d249d3114c393b39c4abe9582752f9d626fb38253505f280744e551f4ad75b53929ad2c78a7375479fa31
+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-r1.ebuild 8372 SHA256 dc7a897ef44059d52af71a0cbc4d2aefbc641874aa55e7ed32260612f2cae72a SHA512 ce33ab07edcff63a83139ebd2aa4ab8b5df503f91bcc957af396e9ab02769b733274734bc8c8d77d635a83675d25d2455c8191af8f5dbdfc8de2346228adf19e WHIRLPOOL 536340e8750a5e4444545f6c30ef28f158c2f0ae48942d40c92132906e6f578ae763fcd03c89985fdd346b368a8f8a7dee326a6fb646afff324b6ab2a7a80f40
-MISC ChangeLog 3339 SHA256 0b3ab7997a07bc6edb60f3b5f13d36049071cf9b284595423c91780794fb0ebf SHA512 272d14a66e8646cf48bf84f3f611d3aae0ba4b30b445e0f8eff4c175d36e79931d7e65b5ef18454dd98420ec12294deaccee0e06c1bea177e2e824ef40f73e04 WHIRLPOOL be2b0bcd1b36d84ff4e816bb496c8d3d79492d91eb1025b88d6bd57211506e8eb8eb5c86cc97a7ce59257eaeb5ccf218eddfe484697e7220f084c3f945752ca3
+EBUILD librets-1.5.3-r2.ebuild 7968 SHA256 9b07aa6e358a0cc4bec96b3f4becf2be5376c429e4000e254dbb33e67b3a9427 SHA512 89c1a755d6b5b611057357ad67c5975177733007f53435ba1bfa178138c1b448db1669c1d7bc7029ddb0d61a16f5814b0b3fffa908e09ae6051a66edf4c18b14 WHIRLPOOL dd3fd38e044ab3981b79fbe79f5698f88176274985b0bc46949dd19dd203a56dd140894cec9cbdff9df51f17d1e8da6feb14a1f6ca427755a20248a77f55ca23
+MISC ChangeLog 3628 SHA256 38bc304843e77d5c41c268e803392b733b64211c97145a02034044d33a5359b1 SHA512 63d5436491f6dc17d86036a2a9f4c5f731dd67df14d22a936c66f839d67f8f6ae798ea883927ce0b177b2f95ed46c70affadf2886284790f66fe45ce756589cc WHIRLPOOL e05df8274c10c60caf740c0f7f036e4af6945cd5c4ca1580b4fd533b7b35239a4e3fbb1bdbd7fe7badeb95e88f0c8d413c9f5a821fb9777958af99962ea9352e
 MISC metadata.xml 774 SHA256 5b2aeaf3434f0c6ca946cb530fc822c8d54abde507e47eee513c473680126ffa SHA512 e0330367997c697881dd10980ad7b2b41700e65ad1cf8ddfc3fd879d933da3e3cfde676e35b645fb86550a32ec02702bc9a007c816446e7b1fbc3cd47fe0734c WHIRLPOOL f61f90404603e1162ce2917e641c1e66a566e10fef02c0e46e63f5210a50c0d8ce6ef438551ef5160b5037537456dc019260e3f3a16b5aae5bfccd1d5699436a
diff --git a/dev-libs/librets/files/librets-1.5.3-build.patch b/dev-libs/librets/files/librets-1.5.3-build.patch
index 135e1fbb7..0069ee4b4 100644
--- a/dev-libs/librets/files/librets-1.5.3-build.patch
+++ b/dev-libs/librets/files/librets-1.5.3-build.patch
@@ -1,3 +1,5 @@
+Add missing LDFLAGS and change CFLAGS to CXXFLAGS
+
 --- librets-1.5.3/project/build/java.mk
 +++ librets-1.5.3/project/build/java.mk
 @@ -46,7 +46,7 @@
@@ -101,4 +103,4 @@
 +	${CXX} ${CXXFLAGS} ${DOTNET_CXX_FLAGS} -I${LIBRETS_INC_DIR} -I${DOTNET_OBJ_DIR} -I${DOTNET_DIR} -I${SWIG_DIR} -c $< -o $@
  
  ifneq (${SWIG_OSNAME}, MSWin32)
- ########
\ No newline at end of file
+ ########
diff --git a/dev-libs/librets/files/librets-1.5.3-extconf.rb.patch b/dev-libs/librets/files/librets-1.5.3-extconf.rb.patch
index 42c7acee1..2901e2e9e 100644
--- a/dev-libs/librets/files/librets-1.5.3-extconf.rb.patch
+++ b/dev-libs/librets/files/librets-1.5.3-extconf.rb.patch
@@ -1,3 +1,5 @@
+Upstream patch to allow the ruby extension to compile when multiple versions of boost are installed
+
 Index: project/swig/ruby/extconf.rb
 ===================================================================
 --- project/swig/ruby/extconf.rb	(revision 1547)
diff --git a/dev-libs/librets/files/librets-1.5.3-java.mk.patch b/dev-libs/librets/files/librets-1.5.3-java.mk.patch
index 55dda702d..a724e29b1 100644
--- a/dev-libs/librets/files/librets-1.5.3-java.mk.patch
+++ b/dev-libs/librets/files/librets-1.5.3-java.mk.patch
@@ -1,3 +1,5 @@
+Patch to fix compilation errors by removing the java examples target when building for java
+
 Index: project/build/java.mk
 ===================================================================
 --- project/build/java.mk	(revision 1551)
diff --git a/dev-libs/librets/librets-1.5.3-r1.ebuild b/dev-libs/librets/librets-1.5.3-r2.ebuild
index 1abc11e55..c4d0f8a5c 100644
--- a/dev-libs/librets/librets-1.5.3-r1.ebuild
+++ b/dev-libs/librets/librets-1.5.3-r2.ebuild
@@ -7,9 +7,7 @@ EAPI="5"
 PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="librets"
 PHP_EXT_SKIP_PHPIZE="yes"
-# Will add php5-4 support as soon as someone fixes gentoo bug 404453 with swig 2.0.4
-# or upstream fixes the build error with swig >= 2.0.8
-USE_PHP="php5-3"
+USE_PHP="php5-3 php5-4"
 
 PYTHON_COMPAT=( python2_{6,7} )
 
@@ -26,7 +24,7 @@ LICENSE="BSD-NAR"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc java mono perl php python ruby sql-compiler threads"
-# Enabling threads for perl, php, python or ruby causes segmentation faults in cli scripts but not through apache
+# Enabling thread safety for perl, php, python or ruby causes segmentation faults in cli scripts but not through apache
 REQUIRED_USE="perl? ( !threads )
 	php? ( !threads )
 	python? ( !threads )
@@ -47,16 +45,15 @@ RDEPEND=">=dev-libs/boost-1.46
 	java? ( >=virtual/jdk-1.6.0 ${SWIG_RDEPEND} )
 	mono? ( dev-lang/mono ${SWIG_RDEPEND} )
 	php? ( ${SWIG_RDEPEND} )
-	python? ( ${SWIG_RDEPEND} )
+	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/swig-2.0.5 >=dev-lang/swig-1.3.40-r1 )
+	php? ( dev-lang/php[-threads] >=dev-lang/swig-1.3.40-r1 )
 	python? ( >=dev-lang/swig-1.3.40-r1 )
 	ruby_targets_ruby18? ( >=dev-lang/swig-1.3.40-r1 )
-	ruby_targets_ruby18? ( >=dev-lang/swig-1.3.40-r1 )
 	ruby_targets_ruby19? ( >=dev-lang/swig-2.0.4-r1 )
 	${RDEPEND}"
 
@@ -107,11 +104,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Patch to allow the ruby extension to compile when multiple versions of boost are installed
 	epatch "${FILESDIR}"/${P}-extconf.rb.patch
-	# Patch to fix compilation errors by removing the java examples target when building for java
 	epatch "${FILESDIR}"/${P}-java.mk.patch
-	# add missing LDFLAGS and change CFLAGS to CXXFLAGS
 	epatch "${FILESDIR}"/${P}-build.patch
 	eautoreconf