From 51536d2fe4697ba9114d611178bb9e20d3d5b729 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 23 Dec 2017 20:48:53 +0000
Subject: gentoo resync : 23.12.2017

---
 dev-php/PHPMailer/Manifest                   |  2 +-
 dev-php/PHPMailer/PHPMailer-5.2.26-r1.ebuild | 47 --------------------
 dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild | 64 ++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 48 deletions(-)
 delete mode 100644 dev-php/PHPMailer/PHPMailer-5.2.26-r1.ebuild
 create mode 100644 dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild

(limited to 'dev-php/PHPMailer')

diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 2ff008183215..2596bd565cd5 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,3 +1,3 @@
 DIST PHPMailer-5.2.26.tar.gz 159174 BLAKE2B 989ee85f6ca374bd7f4accf3d18fbd173bbbd3176e6846c9a2aec68f3bfca4ead4e0197f6287e2bc8ed4a125bf7fcb53240a1f8ce6a1813eaffb66067c2c4e9e SHA512 4c3e324ecd1dd23eb40f14ee785fb9b353b742ff4fb26fe0586622038157e60d64560f5ba4a625f16fad6568954d685ebbe436d88bc427d5bd260c056815b656
-EBUILD PHPMailer-5.2.26-r1.ebuild 1292 BLAKE2B 0921338c180891ebf675e10e697eb335bb86d459c682bc43f2da2623dc3a47c640450c49dd560f3f20689d467a081d9cd2fb6e43e810ef8533d80321dccf11b9 SHA512 4628a6c21f0d5d23cfc0ee9754377576044e1302cc69609c9232a74c49c6083f02132ee265b477ca33d333b8627c8adc447d9627cc4168fd59eb2ed055031471
+EBUILD PHPMailer-5.2.26-r2.ebuild 1960 BLAKE2B 7bb0a7ea8e71c6bff9cc37972f0e62b5e71184707da7f7543d8fa5578ecb090ce8be4086ad2abb55675ec3647435e2559cd0acc84e4fd0cc5bbb12e1fd290668 SHA512 2c147dd3d6c8ecefd05716a8767fb45e373af2845adf7a2d18bc894374f78fedeff614addd829f0137d9dc6bfd40059548068cac8af82e9c25b1cec839fea746
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.26-r1.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.26-r1.ebuild
deleted file mode 100644
index 152762c2a1fb..000000000000
--- a/dev-php/PHPMailer/PHPMailer-5.2.26-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Full-featured email creation and transfer class for PHP"
-HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +examples"
-
-RDEPEND="dev-lang/php:*[ctype,filter,ssl]"
-DEPEND="${RDEPEND}
-	doc? ( dev-php/phpDocumentor )"
-
-src_compile(){
-	if use doc; then
-		phpdoc --filename="class.*.php" \
-			   --target="./html" \
-			   --cache-folder="${T}" \
-			   --title="${PN}" \
-			   --sourcecode \
-			   --force \
-			   --progressbar \
-			   || die "failed to generate API documentation"
-	fi
-}
-
-src_install(){
-	# To help out the Composer kids, most of the documentation and
-	# tests are missing from the release tarballs.
-	insinto "/usr/share/php/${PN}"
-	doins -r *.php language extras
-
-	use examples && dodoc -r examples
-	use doc && dodoc -r html/*
-}
-
-pkg_postinst(){
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog "To use it in a script, require('${PN}/${PN}Autoload.php'),"
-	elog "and then use the ${PN} class normally. Most of the examples in"
-	elog "the documentation should work without further modification."
-}
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild
new file mode 100644
index 000000000000..1cd077177b3f
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples idn ssl"
+
+# The ctype and filter extensions get used unconditionally, with no
+# fallback and no "extension missing" exception. All of the other
+# extensions are technically optional, depending on how you use
+# PHPMailer and whether or not you're willing to settle for fallback
+# implementations.
+#
+# The insane dependency string is to prevent the ctype and filter
+# extensions from being provided by one version (i.e. slot) of PHP,
+# while intl and unicode are provided by another.
+RDEPEND="
+	ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
+	)
+	!ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter] )
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-php/phpDocumentor )"
+
+src_compile(){
+	if use doc; then
+		phpdoc --filename="class.*.php" \
+			   --target="./html" \
+			   --cache-folder="${T}" \
+			   --title="${PN}" \
+			   --sourcecode \
+			   --force \
+			   --progressbar \
+			   || die "failed to generate API documentation"
+	fi
+}
+
+src_install(){
+	# To help out the Composer kids, most of the documentation and
+	# tests are missing from the release tarballs.
+	insinto "/usr/share/php/${PN}"
+	doins -r *.php language extras
+
+	use examples && dodoc -r examples
+	use doc && dodoc -r html/*
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "To use it in a script, require('${PN}/${PN}Autoload.php'),"
+	elog "and then use the ${PN} class normally. Most of the examples in"
+	elog "the documentation should work without further modification."
+}
-- 
cgit v1.2.3