Also build for php-5.5 (bug #491852), add various bug-fixes from Fedora and Ubuntu/Debian, fix Perl-bindings installation.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1A5D023975B0583D!

9 files changed, 426 insertions, 127 deletions

diff --git a/dev-libs/ossp-uuid/ChangeLog b/dev-libs/ossp-uuid/ChangeLog
index f5fbb68bc0d9..f1ef3edc5029 100644
--- a/dev-libs/ossp-uuid/ChangeLog
+++ b/dev-libs/ossp-uuid/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/ossp-uuid
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ChangeLog,v 1.44 2013/03/11 08:09:11 olemarkus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ChangeLog,v 1.45 2014/06/25 06:48:01 dev-zero Exp $
+
+*ossp-uuid-1.6.2-r3 (25 Jun 2014)
+
+  25 Jun 2014; Tiziano Müller <dev-zero@gentoo.org>
+  +files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch,
+  +files/ossp-uuid-1.6.2-fix-whatis-entries.patch,
+  +files/ossp-uuid-1.6.2-hwaddr.patch, +files/ossp-uuid-1.6.2-manfix.patch, +fil
+  es/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch,
+  +ossp-uuid-1.6.2-r3.ebuild, -files/ossp-uuid-1.6.2-gentoo.patch:
+  Also build for php-5.5 (bug #491852), add various bug-fixes from Fedora and
+  Ubuntu/Debian, fix Perl-bindings installation.
 
   11 Mar 2013; Ole Markus With <olemarkus@gentoo.org>
   -ossp-uuid-1.6.2-r1.ebuild:
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index d724ee295974..bf2b3b1ea49c 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -1,25 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ossp-uuid-1.6.2-fix-data-uuid-from-string.patch 1036 SHA256 d222ae84d8c401eac74022b95db0fda170699d4bb00af3a036eb8a749cbc6ac3 SHA512 67b8107fe83141bf7e98090ddcd9c2c03d9a52d4d421395941281c22acfa350007dcbeaa8dbe48c421a26166c4a161dc721efa687fabf10ea902b926919e3860 WHIRLPOOL 90d90263254f9061b95accfa559c234b7a34fb07456e87375dd3029b917fa53d640a674f4ca0f3e490b2562356eb268cc33b5a1c8d264cd85cf1726b9ddb71b6
+AUX ossp-uuid-1.6.2-fix-whatis-entries.patch 1127 SHA256 88bf2a9c20cf0de2e6e9e2ea4ee15db72016868d88c0f597ec1228083867c313 SHA512 99c2af0d000a51994f11b1c944cadd935c77a7ce65ee733dafd3ecaa92696defb0599883d8f80bdd4a292b4d7b08a50a61d9f989905c5cfadafdb9dd50116a15 WHIRLPOOL 051e365055067e3605a15d442e412e04c55ba54b393fefdd6e4594d65b616897e92839ede35bb61059c4e125f1c8807005742f781df342c812d4df69f2e78658
 AUX ossp-uuid-1.6.2-gentoo-perl.patch 1114 SHA256 3052c608f7f3064f91960c408c2d3d4bab5e7426599ad5933c56f33259044f95 SHA512 c4cab9327b49ff0c31b05744b299e2955ed48551744b7dcbdd8c736bf54580d7fe7708b0ed6ef99342fd9aa35df1e790f1d7863dba71c51876701d105100c5fd WHIRLPOOL 71a683ec1ae10a2c40abc04ee59aa9d5c4cfc150881a9ed0f48759e82dcb7b59303ba742e13a6cb198de60dc239876ec6b3ccd021c05ae9946dff5edc9619157
 AUX ossp-uuid-1.6.2-gentoo-php.patch 1761 SHA256 6a128447989c0b280bf89418d8bf1de23c5e2157d86dcb6ce790701122bd8986 SHA512 e1ae6bf5e4069ac9157484e5cedb24167343c34df86a0ba0a89966ccfe2d856403a5cc97d84f8d1935212ecac1294a24351285cd8fb95b4a8af060145b2ac3af WHIRLPOOL 6d4dae94171f4e13ee38d158716d6b2a0bdf9ac6a28d13f52381cadb91e6394e73576000338fd499ff714ee8dfc5750aae2036541abe223d169eaed179bc3169
 AUX ossp-uuid-1.6.2-gentoo-r1.patch 2896 SHA256 0bbed714d11cc573510c84910af9e60f1d1d1381e98d573ad6e9776707f91b65 SHA512 e2fc7c1736e831ff640177de1458253c2303957dfc8b50de1e6056b18cd9f60ad8a9a2f067c2e2295248a4ffad11368298684f8f01d755e41e2ca06489affee0 WHIRLPOOL cd795fd9c2c3f2e442bffe7b978c31027409e972a9b81bd32c712389c1a7f4a05a3f69974bfd3157d27e594f0072a9208dda48698c45388f2d182aec65cdfa5b
-AUX ossp-uuid-1.6.2-gentoo.patch 4777 SHA256 4b51299cab73dec10500b2114a5993532a6358686c643d5ae9b9d7e7ff0e211c SHA512 338abe26c2d05878f27f7e7d5f8ca0aaf11a0ff15ac5fc829f335889c9be57b779d349b2b17c649722c3793ba1f4c49808d77e1644c76878cd1aca6cdafff285 WHIRLPOOL ac537f38a4f7ade6f595fe4b70486fcb108413cc5061135a38f9b5b82917cdb646c1e8b43c6ddc8fec188420d5cef229aa6b5d33c0eabcf494474553aaa9f65d
+AUX ossp-uuid-1.6.2-hwaddr.patch 4535 SHA256 a30e320a97b25f46d19191538dae3d01d9cc00f07dc5a0e8ed6132a774c9f3a1 SHA512 36d86dacd20cabfa432c3696b227ec1b385b8569cd9ae5c7c00470b26e87d013b05a037602310359b1be1343eac5494196280c6fc7a433c200c0b11807e91bd7 WHIRLPOOL 07e0d9bacddfcf88eb3e8dfd426ab86b8fb81fd51ab2e6716e010dbe7c3692375f069c465840760809ea39e38db355170b3922c11e06a0ae69ba95f0a6410ad2
+AUX ossp-uuid-1.6.2-manfix.patch 539 SHA256 b404e6c42629fb917976ded6e2768c80aa1f7c8f5148de3b124d03b615ff7ab1 SHA512 d0467ab931e153b10ac95a45830d55848fd40f23704bcf9bdb9445effa5056c164c966cb84f883c6c290cd1a711f1ea821ef0fff6e027e6fbd4008e9feee8bae WHIRLPOOL a1260148603e08499b83654598b84d116892fdb5186603ed411fb3b53c9036e767176555e21658f32ccbbf558df9791cbd0a7dbd908d837226de0cab1cdd812a
 AUX ossp-uuid-1.6.2-php.patch 371 SHA256 89d7f9cd6d2433e9a0cc1c601aa0a5fda2cc1a195a5ed7f2a92dfb8763c2c6a3 SHA512 cf948bc8087d7025b8dcf14eb3042460085fdf27ca7e07d71f51bf6dec2a0a081a96f5091fbc299b6a0a07c82e607cd8bb3428a901164be817db4440053550dd WHIRLPOOL f85447d38ee71547fd41d7f4688023a75faf23aa0b020bea312bddf594dbe7148d528e3483bf39d37d7576b53693b5ba4a2182df1767921edc34faf5f2c4686a
+AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 SHA256 2acc907a73579fb6bb2639f5ca87534a0654b0b7a554ee48c4c2cba8661efa58 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c WHIRLPOOL bf904548ba0130b70f513b3759e76b1f7d9f1e00aaa935223ec1871b1f322d152e787d41adadd8e7135f4be50cd376345f12a5b2e42b29722ee504c4666c44f3
 DIST uuid-1.6.2.tar.gz 397048 SHA256 11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0 SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e WHIRLPOOL 424a7e7e40e51aa7a516c129312548c315ab6581a567bab5ca7ea9289aa9b75ef58db12b947aa58e76d9d6bb151b2cad8709be11f068c43ab986a3396c3b2c4c
 EBUILD ossp-uuid-1.6.2-r2.ebuild 2393 SHA256 89dd7a9910ea3145211b981c030649e6d48063934b881f0e827b93cb612c97b6 SHA512 5034bd71a5b8726448777372d79d01be6b9cfd6710d045b7c97af8af13f4cb686924fb99ee8a33e43cb3496dbd05b46f53cb3c50de46047920e1b3998c045707 WHIRLPOOL 7b56bf955d79bdad9ac1226ffea7bd40c7515eb311f442235a2f7ec956a84df382f3dbd69635225cdfb2a00e1369c87e1d70504d5966d958f5d8c4bfafed5caa
-MISC ChangeLog 5904 SHA256 73aa5e80c573cc7084a6b028f2b781de488a990cd635a769a6b4340af246ee17 SHA512 e3f05df1c447e7cb0661d4cce8a58dd4f732f72646e9b58f69b7d25f2b9b9e92165f8682a06a9b13690fe3012e364c8f1120531ddb8014e0ed30a04c336c7901 WHIRLPOOL b7096b5381a32fe232e268bfc88f3affe7e6e428ba60dcda57090a01b64577977f8f5d0317878e9b6f1b33fe1c02713d762d94cecb51fa7013ba1e49abc431cb
+EBUILD ossp-uuid-1.6.2-r3.ebuild 2955 SHA256 db8f73f3c3e3b30caf30daca1a83cda58604c56f9f642739e2f16d1ec0436fce SHA512 fd7ae99a692fe23df958a15bbf1a3b3cb2cc359a2e35f5a6914673322b0131e1335197e984fcb97116f0c0536b168584d07f831c3d68f6841e8eecb26380106e WHIRLPOOL 11be665de389978f1305f4814adb2c410dcad203f17b1ed666b27cc73394b14003d1febf630419c4faac816a805615ead90bc70ca9159647534fdced22d39eff
+MISC ChangeLog 6455 SHA256 ddded559aba819b9024a720f36cd124b0a8007b8e42da30706eb75b5abae070f SHA512 a4cae5feff49c10a97a8b079cfe101e0afb5d9f9ab936388f14fc1a48ac84c16f4ce791b44a2b34be70f41282bd1209bed9e098ca91d445ff6da73d9cd119c96 WHIRLPOOL 3dd1a83004c497113893011f46f227d26ea4f07fc64423e3b5c00c7273fd48e922c70f6c0681e94a5e01a886a9dc8f7c6972f8669d8372912d845aa2dffee34f
 MISC metadata.xml 234 SHA256 3299defd0e5e3780bf8db22ac755b39ecc0d5ae97b62507f6795c1dd74b4949b SHA512 0e24d065bda388b72e7034a20c7405b4319deafd2989b874e1740dd596f9cf7395b7acaa11c2617bcaa2cd8d295c44a768a789c1fbe07e455d3b33f2a6aa031b WHIRLPOOL d2b0c4dd530ba32a5272f7555f782ba9d69cb9a1e04b88b45c3f6a54d94e57af4bc59143861e469a595c5260f37a68c51d38d988734f7c5234368847ed62ef7b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJRPZEqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1xBYH/ibKU/giFx+Hcl4CMWW56Oym
-8FWoyowQgV0wU1rVynb4AjV4LAgAs36e5DTEXY2Z8kK9hSPRLzzE5/0zk0rS/yTX
-BaaDY55vBYdTiNs7hUULUZZJSzbTPI4AqE04oaYxUlcm18joxFYtwYG/X7NA0XVe
-kPoGnriyzaP2FtGD7d/lTP2Jm6jjqYJPpMZKf2e/bg5rIpKr59lTzkpFxsaTr6SK
-3bsSIoDONt/o7kSnVnCFno3mn6X3JCy1mXeRyEt8ILt+K6AC4Uzs8XlyegRcUcKL
-mlsZ6vJy+SrDsP8v3HcoFlcyWfk0XiTv3uRyY61FyVhujdR2Gc6HbYnHXXov9I8=
-=FACG
+iQJ8BAEBCABmBQJTqnCiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx
+QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9j3MP/iAAgFypQzKAyDOqX1YIYa3j
+b72IAbxVSnbeQdskTG8+fq6JO8TFIWG7Al5sRIU5gwq1uPcCXn+fhw/ZzG5RPtcu
+OygK8Rw8ZNTTrGvGRuoiSAsZeTjRDZGCub+7jWztH5j59R5v3OTWQzITzVvDtp0C
+4C8ikUkaTiOGu3RARNRkShqiBjXPmQpqgiTL/eWiTe3Yc5TNDNYuM7+YqkKpFLQO
+v0qBlVxEacxD0ppNb5uzqaC9/48nAi9Tu324F2Z9C/Qcvpz7jeJwMZPV0dKBYE15
+6UkF/iehPenyJvvyxb3alQsVOVQwRJdVE9/hZ74jNMq+xb39XHdBWlBEbnJ4sA07
+9CtyW5ViuOIDJR2sims7/T19mYNcW6qcNCd88hogsVdzEIDJjsklp05ma35D21R/
+FJGErSMvoTwOD2ipZjfPTx9SVDBSdTXV5NIjwxJyatpj/M6MejzYlBHAtspkrPdT
+X6l5jSV5OKG1mZS3ceo2kDESFNtV6LvlWaVzDogKaVM/44jhV8FZDswzQAccB5HG
+mIeX7C4V9LKojhaBnB7uQVP+VYaqDetUrAz0ZIs648/MrxGbhKn7ftf57yOfcdw+
+duVfgx88dX/JWPl0E09PfdxLG97yCh3ifB69avTSVxzdmAOQ5i/zxWxbK4YZOMRT
+1O7gQo1zZUqp3Me4s0so
+=uuDO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch
new file mode 100644
index 000000000000..1f92cea3ae69
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch
@@ -0,0 +1,36 @@
+Description: Support dash-less args to from_string.
+Author: Tim Retout <diocles@debian.org>
+Bug-Debian: http://bugs.debian.org/635607
+
+The module Data::GUID depends on Data::UUID supporting this behaviour.
+
+--- a/perl/uuid_compat.pm
++++ b/perl/uuid_compat.pm
+@@ -93,7 +93,9 @@
+     $uuid->import('str',
+           $str =~ /^0x/
+         ? join '-', unpack('x2 a8 a4 a4 a4 a12', $str)
+-        : $str
++        : $str =~ /-/
++        ? $str
++        : join '-', unpack('A8 A4 A4 A4 A12', $str)
+     );
+     return $uuid->export('bin');
+ }
+--- a/perl/uuid_compat.ts
++++ b/perl/uuid_compat.ts
+@@ -28,7 +28,7 @@
+ ##  uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part)
+ ##
+ 
+-use Test::More tests => 14;
++use Test::More tests => 16;
+ 
+ BEGIN {
+     use_ok('Data::UUID');
+@@ -53,3 +53,5 @@
+ ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8"));
+ ok($ug->compare($uuid7, $uuid8) == 0);
+ 
++ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8"));
++ok($ug->compare($uuid7, $uuid9) == 0);
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch
new file mode 100644
index 000000000000..060a7540f1f9
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch
@@ -0,0 +1,51 @@
+From: Marco Nenciarini <marco.nenciarini@devise.it>
+Date: Tue, 2 Feb 2010 12:16:49 +0100
+Subject: [PATCH] Fix whatis entries
+
+Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages
+---
+ uuid++.pod   |    2 +-
+ uuid.pod     |    2 +-
+ uuid_cli.pod |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/uuid++.pod b/uuid++.pod
+index 8b5a4b1..89c5efb 100644
+--- a/uuid++.pod
++++ b/uuid++.pod
+@@ -31,7 +31,7 @@
+ 
+ =head1 NAME
+ 
+-B<OSSP uuid> - B<Universally Unique Identifier> (C++ API)
++B<uuid++> - B<Universally Unique Identifier> (C++ API)
+ 
+ =head1 VERSION
+ 
+diff --git a/uuid.pod b/uuid.pod
+index 4ad3742..0179a46 100644
+--- a/uuid.pod
++++ b/uuid.pod
+@@ -31,7 +31,7 @@
+ 
+ =head1 NAME
+ 
+-B<OSSP uuid> - B<Universally Unique Identifier>
++B<uuid> - B<Universally Unique Identifier>
+ 
+ =head1 VERSION
+ 
+diff --git a/uuid_cli.pod b/uuid_cli.pod
+index ddec6bb..df9dc83 100644
+--- a/uuid_cli.pod
++++ b/uuid_cli.pod
+@@ -31,7 +31,7 @@
+ 
+ =head1 NAME
+ 
+-B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool>
++B<uuid> - B<Universally Unique Identifier Command-Line Tool>
+ 
+ =head1 VERSION
+ 
+-- 
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch
deleted file mode 100644
index 6289230b3516..000000000000
--- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -Naur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
---- uuid-1.6.2.orig/Makefile.in	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/Makefile.in	2009-03-21 12:53:54.201971177 +0100
-@@ -62,13 +62,13 @@
- PHP         = @PHP@
- PG_CONFIG   = @PG_CONFIG@
- 
--LIB_NAME    = libuuid.la
-+LIB_NAME    = libossp-uuid.la
- LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
- 
--DCE_NAME    = libuuid_dce.la
-+DCE_NAME    = libossp-uuid_dce.la
- DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
- 
--CXX_NAME    = libuuid++.la
-+CXX_NAME    = libossp-uuid++.la
- CXX_OBJS    = uuid++.lo $(LIB_OBJS)
- 
- PRG_NAME    = uuid
-@@ -112,15 +112,15 @@
- 	@$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
- 
- $(LIB_NAME): $(LIB_OBJS)
--	@$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
-+	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
- 	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
- 
- $(DCE_NAME): $(DCE_OBJS)
--	@$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
-+	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
- 	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
- 
- $(CXX_NAME): $(CXX_OBJS)
--	@$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
-+	@$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
- 	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
- 
- $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)
-@@ -253,7 +253,7 @@
- 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
- 	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
- 	fi
--	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
-+	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/
- 	$(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
- 	-@if [ ".$(WITH_PERL)" = .yes ]; then \
- 	    (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
-diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4
---- uuid-1.6.2.orig/php/config.m4	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/config.m4	2009-03-21 12:53:06.282809038 +0100
-@@ -33,10 +33,10 @@
- if test "$PHP_UUID" != "no"; then
-     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
-     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
--    PHP_ADD_LIBPATH([..], )
--    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
-     PHP_ADD_INCLUDE([..])
-     PHP_SUBST(UUID_SHARED_LIBADD)
-+    LDFLAGS="$LDFLAGS -L../.libs"
- 
-     dnl  avoid linking conflict with a potentially existing uuid_create(3) in libc
-     AC_CHECK_FUNC(uuid_create,[
-diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local
---- uuid-1.6.2.orig/php/Makefile.local	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/Makefile.local	2009-03-21 12:53:06.282809038 +0100
-@@ -42,7 +42,7 @@
- 
- test: build
- 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \
--	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version
-+	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version
- 
- install: build
- 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
-diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts
---- uuid-1.6.2.orig/php/uuid.ts	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/uuid.ts	2009-03-21 12:53:06.282809038 +0100
-@@ -36,7 +36,7 @@
- 
- print "++ loading DSO uuid.so (low-level API)\n";
- if (!extension_loaded('uuid')) {
--    dl('modules/uuid.so');
-+    dl('uuid.so');
- }
- 
- print "++ loading PHP uuid.php${php_version} (high-level API)\n";
-diff -Naur uuid-1.6.2.orig/uuid-config.in uuid-1.6.2/uuid-config.in
---- uuid-1.6.2.orig/uuid-config.in	2009-03-21 12:52:49.146166177 +0100
-+++ uuid-1.6.2/uuid-config.in	2009-03-21 12:53:06.282809038 +0100
-@@ -121,7 +121,7 @@
-             output_extra="$output_extra $uuid_ldflags"
-             ;;
-         --libs)
--            output="$output -luuid"
-+            output="$output -lossp-uuid"
-             output_extra="$output_extra $uuid_libs"
-             ;;
-         * )
-diff -Naur uuid-1.6.2.orig/uuid.pc.in uuid-1.6.2/uuid.pc.in
---- uuid-1.6.2.orig/uuid.pc.in	2009-03-21 12:52:49.146166177 +0100
-+++ uuid-1.6.2/uuid.pc.in	2009-03-21 12:53:06.282809038 +0100
-@@ -36,7 +36,7 @@
- Description: Universally Unique Identifier (UUID) Library
- Version: @UUID_VERSION_RAW@
- URL: http://www.ossp.org/pkg/lib/uuid/
--Cflags: -I${includedir}
--Libs: -L${libdir} -luuid
-+Cflags: -I${includedir}/ossp
-+Libs: -L${libdir} -lossp-uuid
- Libs.private: @LIBS@
- 
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch
new file mode 100644
index 000000000000..0adc837ae163
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch
@@ -0,0 +1,116 @@
+diff -urN uuid-1.6.2/configure uuid-1.6.2/configure
+--- uuid-1.6.2/configure	2008-07-04 15:43:09.000000000 -0600
++++ uuid-1.6.2/configure	2012-06-06 19:19:41.659880386 -0600
+@@ -14208,7 +14208,7 @@
+ 
+ 
+ 
+-for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h
++for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h netpacket/packet.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+diff -urN uuid-1.6.2/uuid.c uuid-1.6.2/uuid.c
+--- uuid-1.6.2/uuid.c	2008-03-07 03:49:59.000000000 -0700
++++ uuid-1.6.2/uuid.c	2012-06-06 15:50:30.060881473 -0600
+@@ -72,6 +72,8 @@
+ /* IEEE 802 MAC address octet length */
+ #define IEEE_MAC_OCTETS 6
+ 
++static unsigned char mac_unset[IEEE_MAC_OCTETS] = {BM_OCTET(1,0,0,0,0,0,0,0), 0x00, 0x00, 0x00, 0x00, 0x00};
++
+ /* UUID binary representation according to UUID standards */
+ typedef struct {
+     uuid_uint32_t  time_low;                  /* bits  0-31 of time field */
+@@ -967,7 +969,7 @@
+      *  GENERATE NODE
+      */
+ 
+-    if ((mode & UUID_MAKE_MC) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) {
++    if ((mode & UUID_MAKE_MC) || !memcmp(uuid->mac, mac_unset, IEEE_MAC_OCTETS)) {
+         /* generate random IEEE 802 local multicast MAC address */
+         if (prng_data(uuid->prng, (void *)&(uuid->obj.node), sizeof(uuid->obj.node)) != PRNG_RC_OK)
+             return UUID_RC_INT;
+diff -urN uuid-1.6.2/uuid_mac.c uuid-1.6.2/uuid_mac.c
+--- uuid-1.6.2/uuid_mac.c	2008-03-07 03:49:59.000000000 -0700
++++ uuid-1.6.2/uuid_mac.c	2012-06-06 19:30:49.050879930 -0600
+@@ -76,6 +76,9 @@
+ #ifdef HAVE_IFADDRS_H
+ #include <ifaddrs.h>
+ #endif
++#ifdef HAVE_NETPACKET_PACKET_H
++#include <netpacket/packet.h>
++#endif
+ 
+ /* own headers (part (1/2) */
+ #include "uuid_mac.h"
+@@ -87,6 +90,10 @@
+ #define TRUE (/*lint -save -e506*/ !FALSE /*lint -restore*/)
+ #endif
+ 
++#if !defined(min)
++#define min(a,b) ((a) < (b) ? (a) : (b))
++#endif
++
+ /* return the Media Access Control (MAC) address of
+    the FIRST network interface card (NIC) */
+ int mac_address(unsigned char *data_ptr, size_t data_len)
+@@ -95,28 +102,41 @@
+     if (data_ptr == NULL || data_len < MAC_LEN)
+         return FALSE;
+ 
+-#if defined(HAVE_IFADDRS_H) && defined(HAVE_NET_IF_DL_H) && defined(HAVE_GETIFADDRS)
++#if defined(HAVE_IFADDRS_H) && (defined(HAVE_NET_IF_DL_H) || defined(HAVE_NETPACKET_PACKET_H)) && defined(HAVE_GETIFADDRS)
+     /* use getifaddrs(3) on BSD class platforms (xxxBSD, MacOS X, etc) */
+     {
+         struct ifaddrs *ifap;
+         struct ifaddrs *ifap_head;
++#if defined(HAVE_NET_IF_DL_H)
+         const struct sockaddr_dl *sdl;
+         unsigned char *ucp;
+-        int i;
++#else
++	const struct sockaddr_ll *sll;
++#endif
+ 
+         if (getifaddrs(&ifap_head) < 0)
+             return FALSE;
+         for (ifap = ifap_head; ifap != NULL; ifap = ifap->ifa_next) {
++#if defined(HAVE_NET_IF_DL_H)
+             if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_LINK) {
+                 sdl = (const struct sockaddr_dl *)(void *)ifap->ifa_addr;
+                 ucp = (unsigned char *)(sdl->sdl_data + sdl->sdl_nlen);
+                 if (sdl->sdl_alen > 0) {
+-                    for (i = 0; i < MAC_LEN && i < sdl->sdl_alen; i++, ucp++)
+-                        data_ptr[i] = (unsigned char)(*ucp & 0xff);
++                    memcpy(data_ptr, ucp, min(sdl->sdl_alen, MAC_LEN));
+                     freeifaddrs(ifap_head);
+                     return TRUE;
+                 }
+             }
++#else
++            if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_PACKET) {
++                sll = (const struct sockaddr_ll *)(void *)ifap->ifa_addr;
++                if (sll->sll_hatype == ARPHRD_ETHER) {
++                    memcpy(data_ptr, sll->sll_addr, min(sll->sll_halen, MAC_LEN));
++                    freeifaddrs(ifap_head);
++                    return TRUE;
++                }
++            }
++#endif
+         }
+         freeifaddrs(ifap_head);
+     }
+diff -urN uuid-1.6.2/config.h.in uuid-1.6.2/config.h.in
+--- uuid-1.6.2/config.h.in	2008-07-04 15:43:10.000000000 -0600
++++ uuid-1.6.2/config.h.in	2012-06-06 21:59:03.370227352 -0600
+@@ -75,6 +75,9 @@
+ /* Define to 1 if you have the <netinet/in.h> header file. */
+ #undef HAVE_NETINET_IN_H
+ 
++/* Define to 1 if you have the <netpacket/packet.h> header file. */
++#undef HAVE_NETPACKET_PACKET_H
++
+ /* Define to 1 if you have the <net/if_arp.h> header file. */
+ #undef HAVE_NET_IF_ARP_H
+ 
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch
new file mode 100644
index 000000000000..c191e17df863
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch
@@ -0,0 +1,13 @@
+diff -up uuid-1.6.2/uuid.1.manfix uuid-1.6.2/uuid.1
+--- uuid-1.6.2/uuid.1.manfix	2013-05-30 15:56:38.630003125 +0200
++++ uuid-1.6.2/uuid.1	2013-05-30 16:00:57.145127756 +0200
+@@ -238,6 +238,9 @@ value representation of a \s-1UUID\s0. E
+ .IP "\fB\-o\fR \fIfilename\fR" 3
+ .IX Item "-o filename"
+ Write output to \fIfilename\fR instead of to \fIstdout\fR.
++.IP "\fB\-r\fR" 3
++.IX Item "-r"
++This is equivalent to \fB-F BIN\fR.
+ .IP "\fB\-d\fR" 3
+ .IX Item "-d"
+ Decode a given \s-1UUID\s0 (given as a command line argument or if the command
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch
new file mode 100644
index 000000000000..1467207f51f5
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch
@@ -0,0 +1,55 @@
+From: Marco Nenciarini <marco.nenciarini@devise.it>
+Date: Wed, 27 Jan 2010 19:46:21 +0100
+Subject: [PATCH] uuid: preserve -m option status in -v option handling
+
+Bug: 531396
+---
+ uuid_cli.c |   19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/uuid_cli.c b/uuid_cli.c
+index d1b0b11..14a67fe 100644
+--- a/uuid_cli.c
++++ b/uuid_cli.c
+@@ -140,11 +140,12 @@ int main(int argc, char *argv[])
+                 i = strtol(optarg, &p, 10);
+                 if (*p != '\0')
+                     usage("invalid argument to option 'v'");
++                version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5);
+                 switch (i) {
+-                    case 1: version = UUID_MAKE_V1; break;
+-                    case 3: version = UUID_MAKE_V3; break;
+-                    case 4: version = UUID_MAKE_V4; break;
+-                    case 5: version = UUID_MAKE_V5; break;
++                    case 1: version |= UUID_MAKE_V1; break;
++                    case 3: version |= UUID_MAKE_V3; break;
++                    case 4: version |= UUID_MAKE_V4; break;
++                    case 5: version |= UUID_MAKE_V5; break;
+                     default:
+                         usage("invalid version on option 'v'");
+                         break;
+@@ -213,10 +214,10 @@ int main(int argc, char *argv[])
+     }
+     else {
+         /* encoding */
+-        if (   (version == UUID_MAKE_V1 && argc != 0)
+-            || (version == UUID_MAKE_V3 && argc != 2)
+-            || (version == UUID_MAKE_V4 && argc != 0)
+-            || (version == UUID_MAKE_V5 && argc != 2))
++        if (   (version & UUID_MAKE_V1 && argc != 0)
++            || (version & UUID_MAKE_V3 && argc != 2)
++            || (version & UUID_MAKE_V4 && argc != 0)
++            || (version & UUID_MAKE_V5 && argc != 2))
+             usage("invalid number of arguments");
+         if ((rc = uuid_create(&uuid)) != UUID_RC_OK)
+             error(1, "uuid_create: %s", uuid_error(rc));
+@@ -232,7 +233,7 @@ int main(int argc, char *argv[])
+                 if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK)
+                     error(1, "uuid_load: %s", uuid_error(rc));
+             }
+-            if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) {
++            if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) {
+                 if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK)
+                     error(1, "uuid_create: %s", uuid_error(rc));
+                 if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) {
+-- 
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild
new file mode 100644
index 000000000000..116d1db808b8
--- /dev/null
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild,v 1.1 2014/06/25 06:48:01 dev-zero Exp $
+
+EAPI="5"
+
+MY_P="uuid-${PV}"
+
+PHP_EXT_NAME="uuid"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_S="${WORKDIR}/${MY_P}/php"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-3 php5-4 php5-5"
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit eutils multilib perl-module php-ext-source-r2
+
+DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID."
+HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
+SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="+cxx perl php static-libs"
+
+DEPEND="perl? ( dev-lang/perl:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+
+	epatch \
+		"${FILESDIR}/${P}-gentoo-r1.patch" \
+		"${FILESDIR}/${P}-gentoo-perl.patch" \
+		"${FILESDIR}/${P}-hwaddr.patch" \
+		"${FILESDIR}/${P}-manfix.patch" \
+		"${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \
+		"${FILESDIR}/${P}-fix-whatis-entries.patch" \
+		"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
+
+	if use php; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env ${slot}
+			epatch \
+				"${FILESDIR}/${P}-gentoo-php.patch" \
+				"${FILESDIR}/${P}-php.patch"
+		done
+
+		php-ext-source-r2_src_prepare
+	fi
+}
+
+src_configure() {
+	# Notes:
+	# * collides with e2fstools libs and includes if not moved around
+	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
+	econf \
+		--includedir="${EPREFIX}"/usr/include/ossp \
+		--with-dce \
+		--without-pgsql \
+		--without-perl \
+		--without-php \
+		$(use_with cxx) \
+		$(use_enable static-libs static)
+
+	if use php; then
+		php-ext-source-r2_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		cd perl
+		# configure needs the ossp-uuid.la generated by `make` in $S
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+
+	if use php; then
+		php-ext-source-r2_src_compile
+	fi
+}
+
+src_install() {
+	DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS"
+	default
+
+	if use perl ; then
+		cd perl
+		perl-module_src_install
+	fi
+
+	if use php ; then
+		php-ext-source-r2_src_install
+		cd "${S}/php"
+		insinto /usr/share/php
+		newins uuid.php5 uuid.php
+	fi
+
+	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
+
+	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
+	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
+	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
+	default
+
+	use perl && emake -C perl test
+}