gentoo resync : 14.07.2018

15 files changed, 1245 insertions, 0 deletions

diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
new file mode 100644
index 000000000000..751121a7b7d6
--- /dev/null
+++ b/dev-libs/ossp-uuid/Manifest
@@ -0,0 +1,15 @@
+AUX ossp-uuid-1.6.2-fix-data-uuid-from-string.patch 1036 BLAKE2B 97287165ba55e00a92f53bbb819ebdfdd9457d8f6b4b8c37c6b2d0ad4880105a094da00f0ad9ac118e4ee8a9edb50b923350b01b69effdbecf8031b2a199624a SHA512 67b8107fe83141bf7e98090ddcd9c2c03d9a52d4d421395941281c22acfa350007dcbeaa8dbe48c421a26166c4a161dc721efa687fabf10ea902b926919e3860
+AUX ossp-uuid-1.6.2-fix-whatis-entries.patch 1127 BLAKE2B a02258db69254d2737cd88a687286584ffd98cda245c7d9b28ce69dfdeb2a2cfcec945eb46c206ca7c6eb21977a54e004f9abc33d2bf49d6d399e4cae9385b75 SHA512 99c2af0d000a51994f11b1c944cadd935c77a7ce65ee733dafd3ecaa92696defb0599883d8f80bdd4a292b4d7b08a50a61d9f989905c5cfadafdb9dd50116a15
+AUX ossp-uuid-1.6.2-gentoo-perl.patch 1114 BLAKE2B d9fa53c6bdbfb0055788bbeb18a4f6e720b568be99e58519bfc4fe00de986652fcc59c05212db9a569eeb7f06960fb899c7282043896c7dafad21fc96e4e07d2 SHA512 c4cab9327b49ff0c31b05744b299e2955ed48551744b7dcbdd8c736bf54580d7fe7708b0ed6ef99342fd9aa35df1e790f1d7863dba71c51876701d105100c5fd
+AUX ossp-uuid-1.6.2-gentoo-php.patch 1761 BLAKE2B 23cc32abcd906ccfed254e4b13332a49b65b3aa9b2323f4b0206fc9513457b4aa11f083495f7d4bcc2b38015f745b489638b473b24ca46501300b91eae9edf66 SHA512 e1ae6bf5e4069ac9157484e5cedb24167343c34df86a0ba0a89966ccfe2d856403a5cc97d84f8d1935212ecac1294a24351285cd8fb95b4a8af060145b2ac3af
+AUX ossp-uuid-1.6.2-gentoo-r1.patch 2896 BLAKE2B 74ff1d57f43f5b99bcbd8ae3295e19d1cf43128eb39fe6990895874642a72d9d1060d6a02b6d2d3f6e88a1061d124e4f42c9f3e95b41cbb65763775a8afc548c SHA512 e2fc7c1736e831ff640177de1458253c2303957dfc8b50de1e6056b18cd9f60ad8a9a2f067c2e2295248a4ffad11368298684f8f01d755e41e2ca06489affee0
+AUX ossp-uuid-1.6.2-hwaddr.patch 4535 BLAKE2B e91cb616e6f60f410e6d214359da6f785d2c4a685e3796d22c5ec3d5b49bb5b0e65f9f4b87fe2b24c946805d11201bf0a8f3015279a022c47e0f7e1f86f31ab5 SHA512 36d86dacd20cabfa432c3696b227ec1b385b8569cd9ae5c7c00470b26e87d013b05a037602310359b1be1343eac5494196280c6fc7a433c200c0b11807e91bd7
+AUX ossp-uuid-1.6.2-manfix.patch 539 BLAKE2B 040ee470f34d74ed076264310898697a6ee6a624dc96e226f9f696e5db9380b5132a0b3b0fae528fdcd6d8281f60fc94c34d4f67a4525399ff85310c243b0d72 SHA512 d0467ab931e153b10ac95a45830d55848fd40f23704bcf9bdb9445effa5056c164c966cb84f883c6c290cd1a711f1ea821ef0fff6e027e6fbd4008e9feee8bae
+AUX ossp-uuid-1.6.2-php.patch 371 BLAKE2B 0199adacb847c635719777eb33a5313ccf59ebcc2870ce894f4fa9a138c522e4b0999c02bd86d2f319d2b23c8ef821d09addac87ce548c8f2a21286bfe962bb1 SHA512 cf948bc8087d7025b8dcf14eb3042460085fdf27ca7e07d71f51bf6dec2a0a081a96f5091fbc299b6a0a07c82e607cd8bb3428a901164be817db4440053550dd
+AUX ossp-uuid-1.6.2-php70.patch 11172 BLAKE2B 8cd653ff28f8eafb8f47eefb830a18bfa6c2edb519d630b1c9cd5381077a67dd60e31e8be4cfd79ce8ddf6fcb116afcd3cb92ff34f60d5eea0134990cf5e9d77 SHA512 42aaaccedd40126cd1556ee3d5b4b4dbfed720445219d6121abd49cca36b974ae419d53d199d21b5ada41ba7a72948a29b702630cf77154217f78871246ca965
+AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
+AUX uuid-1.6.2-php54.patch 6096 BLAKE2B fcfc58f1c1e1e7b00b669a212d6154db0c2512da137c1cf43efc6703c0e7cbe3623cff2a30607e971f25a8bdd59fb5fc18b7532397ecf7cfbc9ce05e98011069 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527
+DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
+EBUILD ossp-uuid-1.6.2-r4.ebuild 2780 BLAKE2B 8d9477201e7115689ce78730fb57a71a26809b8f8ae42081cc7bd6a04445c6f7f007d3a3659034db79b4cfa215e65d9899deaf368366cdb80608589265934962 SHA512 2f36c1de9803540f124372dfbc5ba82cb8e31a7b168cda04a43c95b24c265ec4386794b00d44d6d24d9f1a98876bbceae94c459daf3cee559b1670b78d718721
+EBUILD ossp-uuid-1.6.2-r6.ebuild 3046 BLAKE2B bf9673f52ac3d58bf47b771634fea820c442a1a71a4a8df2ad9c388249b1b2b3e49ef1da018e3d7c89196cf91a76dc96f448ecfcb547f6f676c9ce57be42ea31 SHA512 bb046bc2d048892e8fa8acbcd0941f548aac5300829d338be94233db5b70fd96b0ed7910edbae181b20d95f6837b941d13bdc389ac65319213c18bdc15b351fa
+MISC metadata.xml 248 BLAKE2B 491e9ad2de37296d9a80e8149cc62db2e8fbf8c8fea001ff675c244f9f61740ee1dbceef0b5f467b88ad105f9be751fc99420eff8429f4a1dbb4a00e2b763e6e SHA512 ceeb1d27ec5afa7cd117c05220a5191629c08a008f5640050fab3deb9610d48610a314cff6f1a73577b3e771c3015e14fbc6273377cad6c559f277982f1b0b80
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-perl.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-perl.patch
new file mode 100644
index 000000000000..a4fade8b088b
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-perl.patch
@@ -0,0 +1,24 @@
+--- tmp/uuid-1.6.2/perl/Makefile.PL	2007-01-01 18:13:18.000000000 +0000
++++ uuid-1.6.2/perl/Makefile.PL	2011-01-07 11:54:23.521585547 +0000
+@@ -33,9 +33,9 @@
+ use ExtUtils::MakeMaker;
+ 
+ #   determine source directory
+-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
+-               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
+-    or die "no source directory found (where libuuid.la is located)";
++my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
++               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
++    or die "no source directory found (where libossp-uuid.la is located)";
+ 
+ #   determine extra build options
+ my $compat = 0;
+@@ -47,7 +47,7 @@
+     VERSION_FROM      => 'uuid.pm',
+     ABSTRACT_FROM     => 'uuid.pod',
+     PREREQ_PM         => {},
+-    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
++    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
+     DEFINE            => '',
+     INC               => "-I. -I$srcdir",
+     PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch
new file mode 100644
index 000000000000..69c788bf1a05
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch
@@ -0,0 +1,42 @@
+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_ADD_INCLUDE([../uuid-1.6.2])
+     PHP_SUBST(UUID_SHARED_LIBADD)
++    LDFLAGS="$LDFLAGS -L../uuid-1.6.2/.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 --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-r1.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-r1.patch
new file mode 100644
index 000000000000..d24fcba721b5
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-r1.patch
@@ -0,0 +1,70 @@
+--- uuid-1.6.2.orig/Makefile.in	2009-03-21 12:52:49.142847389 +0100
++++ uuid-1.6.2.orig/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)); \
+--- uuid-1.6.2.orig/uuid-config.in	2009-03-21 12:52:49.146166177 +0100
++++ uuid-1.6.2.orig/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"
+             ;;
+         * )
+--- uuid-1.6.2.orig/uuid.pc.in	2009-03-21 12:52:49.146166177 +0100
++++ uuid-1.6.2.orig/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-php.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch
new file mode 100644
index 000000000000..d57e8939f154
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch
@@ -0,0 +1,13 @@
+diff --git a/php/uuid.c b/php/uuid.c
+index b76b718..455611a 100644
+--- a/php/uuid.c
++++ b/php/uuid.c
+@@ -496,7 +496,7 @@ PHP_FUNCTION(uuid_version)
+ }
+ 
+ /* module function table */
+-static function_entry uuid_functions[] = {
++static zend_function_entry uuid_functions[] = {
+     PHP_FE(uuid_create,  NULL)
+     PHP_FE(uuid_destroy, NULL)
+     PHP_FE(uuid_clone,   NULL)
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch
new file mode 100644
index 000000000000..0124003bc1fc
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch
@@ -0,0 +1,337 @@
+--- uuid/php/uuid.c	2016-12-18 01:23:26.000000000 -0500
++++ uuid/php/uuid.c	2016-12-18 01:23:43.564329483 -0500
+@@ -41,7 +41,13 @@
+ } ctx_t;
+ 
+ /* context implicit destruction */
++#if PHP_VERSION_ID >= 70000
++static void ctx_destructor(zend_resource *rsrc)
++#else
++typedef long zend_long;
++
+ static void ctx_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
++#endif
+ {
+     ctx_t *ctx = (ctx_t *)rsrc->ptr;
+ 
+@@ -120,16 +126,23 @@
+     zval *z_ctx;
+     ctx_t *ctx;
+     uuid_rc_t rc;
++#if PHP_VERSION_ID >= 70000
++    char *param_types = "z/";
++#else
++    char *param_types = "z";
++#endif
+
+     /* parse parameters */
+-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_ctx) == FAILURE)
++    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx) == FAILURE)
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID < 70000
+     if (!PZVAL_IS_REF(z_ctx)) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: parameter wasn't passed by reference");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#endif
+ 
+     /* perform operation */
+     if ((ctx = (ctx_t *)malloc(sizeof(ctx_t))) == NULL)
+@@ -138,7 +151,12 @@
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: %s", uuid_error(rc));
+         RETURN_LONG((long)rc);
+     }
++#if PHP_VERSION_ID >= 70000
++    zval_dtor(z_ctx);
++    ZVAL_RES(z_ctx, zend_register_resource(ctx, ctx_id));
++#else
+     ZEND_REGISTER_RESOURCE(z_ctx, ctx, ctx_id);
++#endif
+ 
+     RETURN_LONG((long)rc);
+ }
+@@ -158,7 +177,11 @@
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_destroy: invalid context");
+         RETURN_LONG((long)UUID_RC_ARG);
+@@ -185,21 +208,32 @@
+     zval *z_clone;
+     ctx_t *clone;
+     uuid_rc_t rc;
++#if PHP_VERSION_ID >= 70000
++    char *param_types = "rz/";
++#else
++    char *param_types = "rz";
++#endif
+ 
+     /* parse parameters */
+-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_clone) == FAILURE)
++    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_clone) == FAILURE)
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: invalid context");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#if PHP_VERSION_ID < 70000
+     if (!PZVAL_IS_REF(z_clone)) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: clone parameter wasn't passed by reference");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#endif
+ 
+     /* perform operation */
+     if ((clone = (ctx_t *)malloc(sizeof(ctx_t))) == NULL)
+@@ -208,7 +243,12 @@
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: %s", uuid_error(rc));
+         RETURN_LONG((long)rc);
+     }
++#if PHP_VERSION_ID >= 70000
++    zval_dtor(z_clone);
++    ZVAL_RES(z_clone, zend_register_resource(clone, ctx_id));
++#else
+     ZEND_REGISTER_RESOURCE(z_clone, clone, ctx_id);
++#endif
+ 
+     RETURN_LONG((long)rc);
+ }
+@@ -230,7 +271,11 @@
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_load: invalid context");
+         RETURN_LONG((long)UUID_RC_ARG);
+@@ -254,7 +299,7 @@
+     zval *z_ctx;
+     ctx_t *ctx;
+     uuid_rc_t rc;
+-    long z_mode;
++    zend_long z_mode;
+     unsigned long mode;
+     zval *z_ctx_ns;
+     ctx_t *ctx_ns;
+@@ -266,7 +311,11 @@
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid context");
+         RETURN_LONG((long)UUID_RC_ARG);
+@@ -281,7 +330,11 @@
+         }
+     }
+     else if (ZEND_NUM_ARGS() == 4 && ((mode & UUID_MAKE_V3) || (mode & UUID_MAKE_V5))) {
++#if PHP_VERSION_ID >= 70000
++        ctx_ns = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx_ns), ctx_name, ctx_id);
++#else
+         ZEND_FETCH_RESOURCE(ctx_ns, ctx_t *, &z_ctx_ns, -1, ctx_name, ctx_id);
++#endif
+         if (ctx_ns == NULL) {
+             php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid namespace context");
+             RETURN_LONG((long)UUID_RC_ARG);
+@@ -314,21 +367,33 @@
+     uuid_rc_t rc;
+     zval *z_result;
+     int result;
++#if PHP_VERSION_ID >= 70000
++    char *param_types = "rz/";
++#else
++    char *param_types = "rz";
++#endif
+ 
+     /* parse parameters */
+-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_result) == FAILURE)
++    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_result) == FAILURE)
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    zval_dtor(z_result);
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: invalid context");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#if PHP_VERSION_ID < 70000
+     if (!PZVAL_IS_REF(z_result)) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: result parameter wasn't passed by reference");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#endif
+ 
+     /* perform operation */
+     if ((rc = uuid_isnil(ctx->uuid, &result)) != UUID_RC_OK) {
+@@ -353,26 +418,42 @@
+     uuid_rc_t rc;
+     zval *z_result;
+     int result;
++#if PHP_VERSION_ID >= 70000
++    char *param_types = "rrz/";
++#else
++    char *param_types = "rrz";
++#endif
+ 
+     /* parse parameters */
+-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrz", &z_ctx, &z_ctx2, &z_result) == FAILURE)
++    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_ctx2, &z_result) == FAILURE)
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    zval_dtor(z_result);
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+-        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context");
++        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from first parameter");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#if PHP_VERSION_ID >= 70000
++    ctx2 = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx2), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx2, ctx_t *, &z_ctx2, -1, ctx_name, ctx_id);
++#endif
+-    if (ctx2 == NULL || ctx2->uuid) {
+-        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context");
++    if (ctx2 == NULL || ctx2->uuid == NULL) {
++        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from second parameter");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#if PHP_VERSION_ID < 70000
+     if (!PZVAL_IS_REF(z_result)) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: result parameter wasn't passed by reference");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#endif
+ 
+     /* perform operation */
+     if ((rc = uuid_compare(ctx->uuid, ctx2->uuid, &result)) != UUID_RC_OK) {
+@@ -392,7 +473,7 @@
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+-    long z_fmt;
++    zend_long z_fmt;
+     unsigned long fmt;
+     zval *z_data;
+     uuid_rc_t rc;
+@@ -404,7 +485,11 @@
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_import: invalid context");
+         RETURN_LONG((long)UUID_RC_ARG);
+@@ -428,28 +513,40 @@
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+-    long z_fmt;
++    zend_long z_fmt;
+     unsigned long fmt;
+     zval *z_data;
+     uuid_rc_t rc;
+     void *data_ptr;
+     size_t data_len;
++#if PHP_VERSION_ID >= 70000
++    char *param_types = "rlz/";
++#else
++    char *param_types = "rlz";
++#endif
+ 
+     /* parse parameters */
+-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_ctx, &z_fmt, &z_data) == FAILURE)
++    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_fmt, &z_data) == FAILURE)
+         RETURN_LONG((long)UUID_RC_ARG);
+ 
+     /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++    zval_dtor(z_data);
++    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+     if (ctx == NULL || ctx->uuid == NULL) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: invalid context");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
+     fmt = (unsigned long)z_fmt;
++#if PHP_VERSION_ID < 70000
+     if (!PZVAL_IS_REF(z_data)) {
+         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: data parameter wasn't passed by reference");
+         RETURN_LONG((long)UUID_RC_ARG);
+     }
++#endif
+ 
+     /* perform operation */
+     data_ptr = NULL;
+@@ -462,7 +559,11 @@
+         data_len = strlen((char *)data_ptr);
+     else if (fmt == UUID_FMT_STR || fmt == UUID_FMT_TXT)
+         data_len--; /* PHP doesn't wish NUL-termination on strings */
++#if PHP_VERSION_ID >= 70000
++    ZVAL_STRINGL(z_data, data_ptr, data_len);
++#else
+     ZVAL_STRINGL(z_data, data_ptr, data_len, 1);
++#endif
+     free(data_ptr);
+ 
+     RETURN_LONG((long)rc);
+@@ -474,7 +575,7 @@
+    return error string corresponding to error return code */
+ ZEND_FUNCTION(uuid_error)
+ {
+-    int z_rc;
++    zend_long z_rc;
+     uuid_rc_t rc;
+     char *error;
+ 
+@@ -483,7 +584,11 @@
+     rc = (uuid_rc_t)z_rc;
+     if ((error = uuid_error(rc)) == NULL)
+         RETURN_NULL();
++#if PHP_VERSION_ID >= 70000
++    RETURN_STRING(error);
++#else
+     RETURN_STRING(error, 1);
++#endif
+ }
+ 
+ /* API FUNCTION:
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/files/uuid-1.6.2-php54.patch b/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch
new file mode 100644
index 000000000000..c00f560f1fd8
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch
@@ -0,0 +1,226 @@
+diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c
+--- uuid-1.6.2/php/uuid.c	2007-01-01 19:35:57.000000000 +0100
++++ uuid-1.6.2/php/uuid.c	2012-11-06 16:05:03.354913764 +0100
+@@ -60,7 +60,7 @@ static int ctx_id;               /* inte
+ #define ctx_name "UUID context"  /* external name   */
+ 
+ /* module initialization */
+-PHP_MINIT_FUNCTION(uuid)
++ZEND_MINIT_FUNCTION(uuid)
+ {
+     /* register resource identifier */
+     ctx_id = zend_register_list_destructors_ex(
+@@ -91,13 +91,13 @@ PHP_MINIT_FUNCTION(uuid)
+ }
+ 
+ /* module shutdown */
+-PHP_MSHUTDOWN_FUNCTION(uuid)
++ZEND_MSHUTDOWN_FUNCTION(uuid)
+ {
+     return SUCCESS;
+ }
+ 
+ /* module information */
+-PHP_MINFO_FUNCTION(uuid)
++ZEND_MINFO_FUNCTION(uuid)
+ {
+     char version[32];
+ 
+@@ -115,7 +115,7 @@ PHP_MINFO_FUNCTION(uuid)
+    proto rc uuid_create(ctx)
+    $rc = uuid_create(&$uuid);
+    create UUID context */
+-PHP_FUNCTION(uuid_create)
++ZEND_FUNCTION(uuid_create)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -147,7 +147,7 @@ PHP_FUNCTION(uuid_create)
+    proto rc uuid_destroy(ctx)
+    $rc = uuid_destroy($uuid);
+    destroy UUID context */
+-PHP_FUNCTION(uuid_destroy)
++ZEND_FUNCTION(uuid_destroy)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -178,7 +178,7 @@ PHP_FUNCTION(uuid_destroy)
+    proto rc uuid_clone(ctx, &ctx2)
+    $rc = uuid_clone($uuid, &$uuid);
+    clone UUID context */
+-PHP_FUNCTION(uuid_clone)
++ZEND_FUNCTION(uuid_clone)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -217,7 +217,7 @@ PHP_FUNCTION(uuid_clone)
+    proto rc uuid_load(ctx, name)
+    $rc = uuid_name($uuid, $name);
+    load an existing UUID */
+-PHP_FUNCTION(uuid_load)
++ZEND_FUNCTION(uuid_load)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -249,7 +249,7 @@ PHP_FUNCTION(uuid_load)
+    proto rc uuid_make(ctx, mode[, ..., ...])
+    $rc = uuid_make($uuid, $mode[, ..., ...]);
+    make a new UUID */
+-PHP_FUNCTION(uuid_make)
++ZEND_FUNCTION(uuid_make)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -307,7 +307,7 @@ PHP_FUNCTION(uuid_make)
+    proto rc uuid_isnil(ctx, result)
+    $rc = uuid_isnil($uuid, &$result);
+    compare UUID for being Nil UUID */
+-PHP_FUNCTION(uuid_isnil)
++ZEND_FUNCTION(uuid_isnil)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -344,7 +344,7 @@ PHP_FUNCTION(uuid_isnil)
+    proto rc uuid_compare(ctx, ctx2, result)
+    $rc = uuid_compare($uuid, $uuid2, &$result);
+    compare two UUIDs */
+-PHP_FUNCTION(uuid_compare)
++ZEND_FUNCTION(uuid_compare)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -388,7 +388,7 @@ PHP_FUNCTION(uuid_compare)
+    proto rc uuid_import(ctx, fmt, data)
+    $rc = uuid_import($ctx, $fmt, $data);
+    import UUID from variable */
+-PHP_FUNCTION(uuid_import)
++ZEND_FUNCTION(uuid_import)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -424,7 +424,7 @@ PHP_FUNCTION(uuid_import)
+    proto rc uuid_export(ctx, fmt, data)
+    $rc = uuid_error($ctx, $fmt, &$data);
+    export UUID into variable */
+-PHP_FUNCTION(uuid_export)
++ZEND_FUNCTION(uuid_export)
+ {
+     zval *z_ctx;
+     ctx_t *ctx;
+@@ -472,7 +472,7 @@ PHP_FUNCTION(uuid_export)
+    proto rc uuid_error(ctx)
+    $error = uuid_error($rc);
+    return error string corresponding to error return code */
+-PHP_FUNCTION(uuid_error)
++ZEND_FUNCTION(uuid_error)
+ {
+     int z_rc;
+     uuid_rc_t rc;
+@@ -490,24 +490,79 @@ PHP_FUNCTION(uuid_error)
+    proto int uuid_version()
+    $version = uuid_version();
+    return library version number */
+-PHP_FUNCTION(uuid_version)
++ZEND_FUNCTION(uuid_version)
+ {
+     RETURN_LONG((long)uuid_version());
+ }
+ 
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_create, 0)
++    ZEND_ARG_INFO(1, ctx)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_destroy, 0)
++    ZEND_ARG_INFO(0, ctx)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_clone, 0)
++    ZEND_ARG_INFO(0, ctx)
++    ZEND_ARG_INFO(1, ctx2)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_load, 0)
++    ZEND_ARG_INFO(0, ctx)
++    ZEND_ARG_INFO(0, name)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_uuid_make, 0, 0, 2)
++    ZEND_ARG_INFO(0, ctx)
++    ZEND_ARG_INFO(0, mode)
++    ZEND_ARG_INFO(0, ctxns)
++    ZEND_ARG_INFO(0, url)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_isnil, 0)
++    ZEND_ARG_INFO(0, ctx)
++    ZEND_ARG_INFO(1, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_compare, 0)
++    ZEND_ARG_INFO(0, ctx)
++    ZEND_ARG_INFO(0, ctx2)
++    ZEND_ARG_INFO(1, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_import, 0)
++    ZEND_ARG_INFO(0, ctx)
++    ZEND_ARG_INFO(0, fmt)
++    ZEND_ARG_INFO(0, data)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_export, 0)
++    ZEND_ARG_INFO(0, ctx)
++    ZEND_ARG_INFO(0, fmt)
++    ZEND_ARG_INFO(1, data)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_error, 0)
++    ZEND_ARG_INFO(0, ctx)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_version, 0)
++ZEND_END_ARG_INFO()
++
+ /* module function table */
+-static function_entry uuid_functions[] = {
+-    PHP_FE(uuid_create,  NULL)
+-    PHP_FE(uuid_destroy, NULL)
+-    PHP_FE(uuid_clone,   NULL)
+-    PHP_FE(uuid_load,    NULL)
+-    PHP_FE(uuid_make,    NULL)
+-    PHP_FE(uuid_isnil,   NULL)
+-    PHP_FE(uuid_compare, NULL)
+-    PHP_FE(uuid_import,  NULL)
+-    PHP_FE(uuid_export,  NULL)
+-    PHP_FE(uuid_error,   NULL)
+-    PHP_FE(uuid_version, NULL)
++static zend_function_entry uuid_functions[] = {
++    ZEND_FE(uuid_create,  arginfo_uuid_create)
++    ZEND_FE(uuid_destroy, NULL)
++    ZEND_FE(uuid_clone,   arginfo_uuid_clone)
++    ZEND_FE(uuid_load,    NULL)
++    ZEND_FE(uuid_make,    NULL)
++    ZEND_FE(uuid_isnil,   arginfo_uuid_isnil)
++    ZEND_FE(uuid_compare, arginfo_uuid_compare)
++    ZEND_FE(uuid_import,  NULL)
++    ZEND_FE(uuid_export,  arginfo_uuid_export)
++    ZEND_FE(uuid_error,   NULL)
++    ZEND_FE(uuid_version, NULL)
+     { NULL, NULL, NULL }
+ };
+ 
+@@ -516,11 +571,11 @@ zend_module_entry uuid_module_entry = {
+     STANDARD_MODULE_HEADER,
+     "uuid",
+     uuid_functions,
+-    PHP_MINIT(uuid),
+-    PHP_MSHUTDOWN(uuid),
++    ZEND_MINIT(uuid),
++    ZEND_MSHUTDOWN(uuid),
+     NULL,
+     NULL,
+-    PHP_MINFO(uuid),
++    ZEND_MINFO(uuid),
+     NO_VERSION_YET,
+     STANDARD_MODULE_PROPERTIES
+ };
diff --git a/dev-libs/ossp-uuid/metadata.xml b/dev-libs/ossp-uuid/metadata.xml
new file mode 100644
index 000000000000..82f6562fd7e2
--- /dev/null
+++ b/dev-libs/ossp-uuid/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>dev-zero@gentoo.org</email>
+  <name>Tiziano Müller</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild
new file mode 100644
index 000000000000..281c96606a40
--- /dev/null
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-5 php5-4"
+
+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 ~x86-fbsd ~amd64-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
+}
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
new file mode 100644
index 000000000000..f0bc8e587ac4
--- /dev/null
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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"
+PHP_EXT_SKIP_PATCHES="yes"
+USE_PHP="php5-6 php7-0 php7-1"
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit perl-module php-ext-source-r3
+
+DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC 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 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="+cxx perl php static-libs"
+
+DEPEND="perl? ( dev-lang/perl:= )"
+RDEPEND="${DEPEND} php? ( !dev-php/pecl-uuid )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+
+	eapply \
+		"${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"
+
+	eapply_user
+	if use php; then
+		pushd "${PHP_EXT_S}" > /dev/null || die
+		eapply -p2 \
+			"${FILESDIR}/${P}-gentoo-php.patch" \
+			"${FILESDIR}/uuid-${PV}-php54.patch" \
+			"${FILESDIR}/${P}-php70.patch"
+		popd > /dev/null || die
+		php-ext-source-r3_src_prepare
+
+		#Remove call by reference which is error
+		sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die
+	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-r3_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-r3_src_compile
+	fi
+}
+
+src_install() {
+	local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS )
+	default
+	unset DOCS #unset so that other eclasses don't try to install them and possibly fail
+	if use perl ; then
+		cd perl
+		perl-module_src_install
+	fi
+
+	if use php ; then
+		php-ext-source-r3_src_install
+		insinto /usr/share/php
+		cd "${S}/php" || die
+		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
+}