gentoo resync : 20.10.2017

7 files changed, 50 insertions, 219 deletions

diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index aba5239d81c3..87cf6e391c15 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -7,7 +7,7 @@ EBUILD ffcall-1.10-r2.ebuild 1260 SHA256 3e26e8f50b34f0915cc1e045a4f5441c581cd38
 EBUILD ffcall-1.10-r5.ebuild 2007 SHA256 8f4b4650322c6724197c57c811e1674324c4f16bcbe91e6ea9091ff3b9d7e87f SHA512 f71390ff4d83dc72139c53b998316bf614ac6587c182e3ea51d7fbed26f8a468d00e0211623c68a9b0e636bcbf5321e0e1c02b46bda8a1f7a684133f5e357ba3 WHIRLPOOL 7dc9416aa1618b2f3f55c8ac475ab3c1db132d1e6ae36b4bfd50655a5a3eb6872e08da9cba9b7aedaa5b83a1953e4f6f2d6472c0cfd6d88dd06b2aac36b6ec10
 EBUILD ffcall-1.10.ebuild 1622 SHA256 5d50fd5fbbccbf05a90bf710eb73bfa8acf3f32af586ec0e96ddf81ce52f2fe1 SHA512 2ef41a0ec232346b4ebb118f953da2f8de54cbf0d8495e2897261cc56450aaf366e806707c95649429bb9e575c697e3b3c55c6c63746c27abbaeddfc77ec1a8b WHIRLPOOL dcc1822f32f779b90e7914bfd6a8c6f8bd6c42d317b50529cd3e5fb882e0a165633f386d1472c2a9add4eb3a2090c3c650c24445c00d3e87d2a5bc27168ddc90
 EBUILD ffcall-1.13.ebuild 1485 SHA256 38067cc39a4488cb70431b874c0aa448e3555e756504f7721b36d766a129729b SHA512 cd06188825a8ceaa04adca8bb532b429faf7d2c25a66c09e51a1ebbe5f9b204bbb9fa470363044e795fb9aed9c135b31e05456fe613da181b41618dfa828c69d WHIRLPOOL cd66bb1d64078ad1db8f2945f007026756fe03b00a5c64fe34025ce2313b995834678acbc713de8e8fc146ed203129e9b6158bff9913d540457b4c45fff4328b
-EBUILD ffcall-2.0.ebuild 1490 SHA256 429ee7ae686dc645a18d5933ee3bba02a6176d461ad11ed2f3757eab1696ee51 SHA512 15be93575c3979f094bfdf3c1aa8deb809e196e2ccc011dd3b93903ae209f1ad366817839230a09fad8e8374375140936928250a078158f3c82194380d464a95 WHIRLPOOL baa60809ae8e43e9398d158ed2af0ee2dd2cdc73ddc6b887255d83398dd33594dd7ae6b8426d9bf5cdd98f1ffdf55a340e7436acf4a9669eccc1de9d2e450b73
+EBUILD ffcall-2.0.ebuild 1489 SHA256 ce384de92a78e6fa7bad87c2fecf4086f76019073e049bd7258917cd9a0b3775 SHA512 4b1409ffc9a41b3f3639125d34bdd4006a29349f095d2f0fbf90d5191196d98129ee49163cbbe2ea4173aeb24176e17adfb06d6e8d781f77e6b70d3b9f37b785 WHIRLPOOL 580cecc0cace265c9f9e417c8f3756a502e371d73bd0b393b740b5221433792e72662c7565b1db18468aff438073a7f50b84b56caaa866ea874a7d0e8df0bcd1
 MISC ChangeLog 2656 SHA256 5add85d025118d2a7fdad19b45ae0e0f3f52622f74780d7b83aa1069291a4388 SHA512 25e7fd119335582f426e31b67a892e031730f944d6848faa7967bfa9ba1dab6296418893819c420df226ade32f32832154e4326fe8ff5b3b31d82279a52b8c44 WHIRLPOOL 60b83d1e7b058b700eda9f99c36d56c233035aa99724be09b72bd403498317c552783519cdee8d3b1c9385b74ff94a2edf2cf269b7bc88c18df196ed6d52549c
 MISC ChangeLog-2015 5393 SHA256 ebd69c93d3f0ac7e75b68cfb3ae079cddb3bc43fb96f4a61cdf58d1c3c5b37b9 SHA512 9a45eb0c33d64e6dcc51672bcdd2416b077b1cf1b78a146d8dd8f66f55bfbfeee1abace360ab06df70083c41f95c5d3b107ad69e51179587cd18103bad347ae0 WHIRLPOOL b50648963d06c1466f4bf892e285068044cbd70d86e15835c239c884c99d7f73e536f42f4a85a220ff7f43a9e0ea9040d0c572b9c9683f672427b90a429a2f44
 MISC metadata.xml 858 SHA256 1c048c75ac311016b9c59909a71a48571e31371284007ad4244802c59e36f001 SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971 WHIRLPOOL 910dcd051c99f33a78d8b981c6989b340e582df4df6661b575c9c29ab2303ca96037b7e192ad6563f5ab793ad4212d300bc60c25f0cb5b039052acf51ef6a171
diff --git a/dev-libs/ffcall/ffcall-2.0.ebuild b/dev-libs/ffcall/ffcall-2.0.ebuild
index 4a174c02208c..199a208a913b 100644
--- a/dev-libs/ffcall/ffcall-2.0.ebuild
+++ b/dev-libs/ffcall/ffcall-2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_PV}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 1f3cc0a17de0..9cb1128216d1 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,5 +1,7 @@
 AUX libmspack-0.5_alpha-CVE-2017-6419.patch 1483 SHA256 4b3ba5b72796af2a442bb0a01a09d6f19a4cc1544c84f505b9c50d974262e9b4 SHA512 b6aafe82630d3bb1254fcce9a8bc528b0f375a2e7eec5f729e04c2d9816feb23ba12a0275efcf5ced6578789c4ef83b4364104b4cc35c2c146f4fb527c8dbf4a WHIRLPOOL f34e90557d6c01827c032ad9067b7d1d0072f9cd4b49d99c3d6968e30e0d2d64c5a4e405fa5ff93d483268a1ee2dd912ef4e8091ef4265ef90eed0447416646d
 DIST libmspack-0.5alpha.tar.gz 654193 SHA256 8967f275525f5067b364cee43b73e44d0433668c39f9376dfff19f653d1c8110 SHA512 6d4efa0f43c43185ef91c97c1518aa70f09109d7332cda7e12019e146ec9cb0f2065fb1b57683b48bae9a7eaf8e82eb94096644c6d25c56d45878f630b719231 WHIRLPOOL fcbbbdee1ce4c75222767ad7ce3e16d18c3fbf1c7cb60170a9cad51647e3500e11c458f7a65e8c2e0dccfb8a8e3981f13252ac26fd9edce6f633381b77410faf
+DIST libmspack-0.6alpha.tar.gz 476992 SHA256 1edbee82accb28e679ab538f803aab7a5a569e4102ccf1715b462b1bd915f921 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d WHIRLPOOL 5c8fb600af798cb7902c8a7233515004ffc2cc440a152d4296f6827910530259648f73f6e29fd75b5190057b9cf66ad1d180c58255450dbb6b23fce548ad5c73
 EBUILD libmspack-0.5_alpha-r1.ebuild 1056 SHA256 8a72b6596b49c1983142923a489d396737bf24f8fd8ec103311aa681889d7ded SHA512 df255a8f2895b667e46acb21586f7101cbb59d9dff1575a537ce31bbaac7c1d5316ca37ea58c953c1c7854929cea6e5314d5287b915b19cbd8bc943d3f1c2182 WHIRLPOOL c0ce9ca8a6e62e50574c14ae4b2cf4d56fe405d448ae9e6fcdb82bbb3df008aea0aa0763f23b2bdc9d0ae236b8995e26e3c964508956694c84b727134137765f
 EBUILD libmspack-0.5_alpha.ebuild 1001 SHA256 e3ba99982cb2b9704552a2805b912d6c6be5bb1a74c33770609bcd0bdaf30a73 SHA512 04e51296ad4a50665ad8df5d020337c75667f7525412b08356aede88c5b79bfd102613ba5f7a7fd26adbb918a4d78e280f4977949dfcc59a492613ceba1114ed WHIRLPOOL 55f3edd5aea6e803a8c3c70c310d905a8a76e314ad2ecbfce453d8438435512e2b5cdb04d9dcbdff54b9d59915b77e0018d46cc1a9e3fdd4a49f3ef902a8c9f0
+EBUILD libmspack-0.6_alpha.ebuild 1003 SHA256 4a53ba265e2918686067c7c40fd95d0110db4857428834be82399789e3e0ece4 SHA512 8e5c7dd3ac04fdd0dbe84f68d39e531d7427e9ceec23e70b4273041134d665e781809ee6fbd6da215297edda693903684c297b3ea7c7be8ea7bdbcd288a64ce9 WHIRLPOOL 0aee7c1389f2ed9542eb7d88dbaae4d39e873f5b4cc47e4d64a9b6fa83416ac0ec32650266e467d5cb189402894797eae970fac8bc44b5232dfdc3ae34ee0db1
 MISC metadata.xml 269 SHA256 b0e50e7006e04a696bc946ae45550e2bb2d59f449f22ca6a2eade72adb0a927f SHA512 753992cc0fe22a630515becd9f12d80c9929c104521232d87da5fb369c1e3d2a86080d1d54ed1483b54f368882a7a3854a151c7779c5a3ce2aabb06b6a840c2a WHIRLPOOL e9ced1f41b584ec2f6653cbc62c86391fd9306e5f79347bc9d6e82956a7d069177ff5c2e5fc471a4097984889b22fdad936210b3bcd0682327c6aaafb11877b3
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
new file mode 100644
index 000000000000..b8c96e78ed03
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=(AUTHORS ChangeLog NEWS README TODO)
+	prune_libtool_files --all
+	use doc && HTML_DOCS=(doc/*)
+	default_src_install
+	if use doc; then
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+}
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 1c615900adf6..59a7802029ee 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -10,9 +10,7 @@ AUX ossp-uuid-1.6.2-php70.patch 11172 SHA256 c891083d4ebb379711c575f95beefbb284a
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 SHA256 2acc907a73579fb6bb2639f5ca87534a0654b0b7a554ee48c4c2cba8661efa58 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c WHIRLPOOL bf904548ba0130b70f513b3759e76b1f7d9f1e00aaa935223ec1871b1f322d152e787d41adadd8e7135f4be50cd376345f12a5b2e42b29722ee504c4666c44f3
 AUX uuid-1.6.2-php54.patch 6096 SHA256 699053118a958fd4ded677edc92e527f06d6f46b736aa66a35465b7c2fb14a04 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527 WHIRLPOOL f7d178000bfefea3c352f47550dd1c6b089496d9e659ca895263e503a2cd9a2950ecaad18636b35ea1c7aec2ba595d6485116826767d90a9ad186d3c61e04cf0
 DIST uuid-1.6.2.tar.gz 397048 SHA256 11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0 SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e WHIRLPOOL 424a7e7e40e51aa7a516c129312548c315ab6581a567bab5ca7ea9289aa9b75ef58db12b947aa58e76d9d6bb151b2cad8709be11f068c43ab986a3396c3b2c4c
-EBUILD ossp-uuid-1.6.2-r2.ebuild 2243 SHA256 da47ed109ca43a00dc99a1c926dc733626a6f824ff4a3f18d6185fb2e1962b25 SHA512 9024ecf04c25a6585118f83b6a4cc230e32f31da0cf267c04bcca76fbd3e8a4be16cb3a0e84ea84851b2b661a54c4fbc3ef58f4cc90c34836147f4c707ee9ccf WHIRLPOOL 61117bd5dfb045a2ba42b03e9842d6f0bcad76709f7689a20827ecaeeeccaefc9419c48d8fbcde0867599240910a91c5acab7067248ed338e729bae4cffea6c7
 EBUILD ossp-uuid-1.6.2-r4.ebuild 2792 SHA256 c48eb58d9fd632dcca3ab0b736d7a82eef57eb1949d96bda17084a79d1d990d5 SHA512 0f3321e226826c8f15b52d498999a9bb6382800ae0452955c7067b4c5db558886d461505f48030d55c83e469d02b6b500e61d84fb28f7b933bf581820f4be341 WHIRLPOOL 66bd40d8fe2cda7d30a2fc9498a69408146fdc31eaf42a3a4d9ea44742d0ac51a614e81f4a490ff5dc42069431debcb8e79f682fb2a242a9af4a5686c9aa8b4c
-EBUILD ossp-uuid-1.6.2-r5.ebuild 2801 SHA256 00b9670a18c361815fb8b8812799c4997d1e1c7f25eaa23476f6ca6632f988ac SHA512 373375aee54e9176729a11260da7b7b63c3379838d94a6dbfd0730236cad4ebbdf508226c329c07cc87a47edd68a2a8b481af1f1586ff97db927078d9eb9821d WHIRLPOOL 285e0c6e2ce72af15c5cb72050e01a2c352de20c0079fcaa3247067b5848f0bb33c9d7e6ad22210cb862c3e4d0284564f2ce63d227b038d8ef7ac7329794d603
 EBUILD ossp-uuid-1.6.2-r6.ebuild 3048 SHA256 904e60857f6a016a4f23b1e7a4e97d99842c7b776bbcc9c01253d5f54de9aabc SHA512 9bcfa77de8523dbf67c58747a083ba3f86615b4aa981ebbcc7db0f48bdc2ae8d9404ae7c6b5f88e12687353b797b60e61d17b5b2434fb23a48ec2218f54c0ad2 WHIRLPOOL 3d95734c7bbe52427e0831233d237ef2159de97561ef28fcd6135ef6f3867a77b76199a593fb99741af13defce5bf566182a0380375af5a96ec98e2d0910233b
 MISC ChangeLog 2870 SHA256 55a875224e7983a212bc4bf0c38fa3f4e3aab60f62ea97a565be8fb3282f6943 SHA512 ad5a4a5f9233b174a845fcaba47378642b09bbb07050568581a5d552e880401fdba9156f2c0bbddfe3e93eec0e4c354a68a7ceaa20f374b351c8dd65a0f39812 WHIRLPOOL ca83fe11babb31f2a06948434627939ad5cac4f7d9dc9e4b135b18e44fd65a4c1fd2aaaf0aac36f95621e522951a2572eb5c67cf3a3a3d9270a0eca8ed2dc6d6
 MISC ChangeLog-2015 7910 SHA256 08ef57ebfcd6bfec3d03270237bba1c3815761610b9709d45560d67583ebbbd9 SHA512 35fc7a7b3a7882e125f4323fa023fd78fa5476aefac809723d91599afc52d3ff76656876849b49e9b93c3f75e8063a7f4659cea479c8f763664c463f85f6d8ea WHIRLPOOL 515d8eed9b172830cf80d740ac7ffdd99f319380a1678c9d163a935db3774b3f32cee4d2c6ac75821dc4d700a6b92544580b5b5bd1788badac09d1f711196e9d
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild
deleted file mode 100644
index a09822334738..000000000000
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-PHP_EXT_NAME="uuid"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-4"
-
-MY_P="uuid-${PV}"
-PHP_EXT_S="${WORKDIR}/${MY_P}/php"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit eutils multilib 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 ~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"
-
-	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-php \
-		$(use_with cxx) \
-		$(use_with perl) \
-		$(use_enable static-libs static)
-
-	if use php; then
-		php-ext-source-r2_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	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 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
-}
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild
deleted file mode 100644
index a0da82f64f84..000000000000
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 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-6 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 ~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
-}