gentoo resync : 02.12.2017

3 files changed, 6 insertions, 34 deletions

diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index fc30f30b59e0..a2648e70f8d1 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,8 +1,6 @@
 DIST libmowgli-1.0.0.tar.bz2 105929 SHA256 8ea0dfd606b0ac280747c9a5f93ca940c23c7367dee0776715c87623ae6624fb SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313 WHIRLPOOL 209cb5a81003eac9952a771a0afc08073f242566e28d378432a0f172b8b195ccfc03b1a8f85949f1d22063c1519afd48b6263de7e4403a14c365de94d5f8f83e
-DIST libmowgli-2.0.0.tar.gz 200771 SHA256 7c5a94082899d055fc9a02b94e2658b42616fdb98e58e9a71165c07b6f5cceba SHA512 efccd93824c116fa8440f1d327382997f7d752d007dc9fad650ef1935fe0cee1a3fa1c645442a3f3f0f6d9f2916f66882e537a1692c494303fc0bf062df51e3a WHIRLPOOL 75c5698e1ccc5e1895d8d5f35d00347ceaf5424a621ecae399ebfe6537bf591edc21d0e42f7923704e3c857cc7349447d514605bb1d3e0e78f136e530933e8ed
 DIST libmowgli-2.1.3.tar.gz 227742 SHA256 b7faab2fb9f46366a52b51443054a2ed4ecdd04774c65754bf807c5e9bdda477 SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533 WHIRLPOOL d22e33fa4741282779f2ae341e5cdd3ecf18a5d9812e708a5ddd0df51f7a30fdc5b4c8f611187f894d2975f9a013d8f841268be75369abba56407a9d66c50d7f
 EBUILD libmowgli-1.0.0.ebuild 592 BLAKE2B 8ecd3367a72255f72f4d1f33898fdcb6f6e668d1b6ff04866b2f8eca7660d508ca17e7f175da3b32e37d99dc7f21eafe26bfcd5ce5a3715d2bbcc6e74a316209 SHA512 9d9ea4ee4239c5c8be7fa37e653afc06a7d61fd2561b6dc7940e39af689cc1e6f64ac774ef00c6f2c3c8a95b6d47fc41c5d5ed64fecb7472b74b6e2ae2169567
-EBUILD libmowgli-2.0.0-r1.ebuild 801 BLAKE2B 1a50bf356ba9dfc4bbdae5eb26432fdbf19ff9b10526766dceacbf89638d7b9a7fcb7a25779ed18f4e3a00c938b16919a4e03eff6fde5a0ada81de508491697d SHA512 5dd401336088ef6fd66cfd62bb5da31885e13030d67825e636c84c8ac72fd07e595ede030b0449d7b9433469bb279145ea8073b36364d618e6fcbf1ef39b60f4
 EBUILD libmowgli-2.1.3.ebuild 801 BLAKE2B 295cf5e587db6db974e4e6e6d85ad2f049b1ec2b03477ed7f6c9f7dcf3b92023c54736c06a31a97fc94c88a175cd3b0011c4639dca4fba04a9865e496b219c48 SHA512 800bf7527324edf31827105316ce965abae9dcb9e283ab4c3810af13ba74e41fc9a5344646991fce235504588563c23282a15d6c079d0e246117dba9033e4759
-EBUILD libmowgli-9999.ebuild 714 BLAKE2B 02d0f1b1667400b1c3a1a6d7b408194514fbf5a89290cb9e7b59bf776973e826185b38a4fd1f1f411d36a76b60b98ed72ae4f3278ee79cacc6460a1022793798 SHA512 b5363b8374ffe5a0fd1332bc9b1a7a2aa576e99ae6e92653562f5fcf67df11e5dd5cdb28df539dd2d205389ffdf977dbf9d3f6f7b29776e8095cec8828c574b8
+EBUILD libmowgli-9999.ebuild 605 BLAKE2B 986896d6abd75d660d69f86a3822ef95d0626a1d4159970b2b58045b63b1c46866250b59b4467e1216d54cc74664e15790e671ab9a130d908bf0ce58d3d3528c SHA512 635c00a5c1ac8f50ab4f9dff6a1be4fc3e82ee73ca8eead7c553a4f961f65f332f04756328b878b678d4835c763974f8d2588a966679a6113d92fa95c80034bd
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild
deleted file mode 100644
index 84028f134be9..000000000000
--- a/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
-HOMEPAGE="http://atheme.org/projects/libmowgli.html"
-SRC_URI="http://atheme.org/downloads/${P}.tar.gz"
-IUSE="libressl ssl"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
-DEPEND="${RDEPEND}"
-DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
-
-src_configure() {
-	# disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
-	use !ssl && myconf="--with-openssl=/dev/null"
-	econf ${myconf}
-}
diff --git a/dev-libs/libmowgli/libmowgli-9999.ebuild b/dev-libs/libmowgli/libmowgli-9999.ebuild
index 9a22f89057f1..5450f37c16c5 100644
--- a/dev-libs/libmowgli/libmowgli-9999.ebuild
+++ b/dev-libs/libmowgli/libmowgli-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
 HOMEPAGE="http://atheme.org/projects/libmowgli.html"
@@ -18,10 +18,9 @@ RDEPEND="ssl? (
 	libressl? ( dev-libs/libressl:0= )
 )"
 DEPEND="${RDEPEND}"
-DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
+DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
 
 src_configure() {
-	    # disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
-		use !ssl && myconf="--with-openssl=/dev/null"
-		econf ${myconf}
+	econf \
+		$(use_with ssl openssl)
 }