5 files changed, 46 insertions, 98 deletions
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 1886ec79ae72..42bf5201b19a 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,2 +1 @@
-DIST fms-src-0.3.73.zip 3519550 SHA256 f20985efa71c77c843f7cd16e437414ba2810c5a69d7917456e2a2e6e551a6e5 SHA512 457a6808e85dce8ac3cc31ac465eeb6e271294b6aac9436a12adb21f1dacc5ef8726c558dd6734a7418cff1ce92c172062e0eb5b4642e29a83235cccc9198d2c WHIRLPOOL 8fd8a4b59b003df5b3b91f9d9dde134b3832fb572a772e3129889c56c5c9be10040161cff8fcb1b6183ebe156b9b340bef2481d43519044a8cb54ed0887624a4
-DIST fms-src-0.3.75.zip 3691556 SHA256 1fe5e84aba572143fe95ffb384177e150d5cd4dff2930462b9df24b59c03d85e SHA512 ce5754c0f15c18c0e9692bb840119576ffa9eca05ca38060a0778fc170a614d394ffcc06274bcdc4db5659d176f00e993904a76099382e7eea5685c3a83d3cd8 WHIRLPOOL 405198eff290d8b55e5b5c164fbbd845c086ed76d6d17efa24ab630c109d09b83c8a956b45d6613672b08a19101275a6a8375ba06065e6d9e9b20e1da6c759af
+DIST fms-src-0.3.79.zip 3847775 SHA256 b5dbb1e1d075e2134c692038ea95805a528807b0d777e2752f806f6935508f30 SHA512 aa9f505c5ef55b1f462b16de6d870d02dc102fd184cc353c6c6b8a346978a9953b34e878f262f4190a3d15d76c5a37f065c4e5ebdbc0e43a4a5c22d61fa9fba7 WHIRLPOOL ab799a0e318d4bfb750898bd544da31cad39ce81a633da43753bd4c4aa4179425bfeb1b283fc1acf1ec34c2947ce735d48528bd85b664ab50e2f8118f5f30d26
diff --git a/net-p2p/fms/files/fms-use-system-libs2.patch b/net-p2p/fms/files/fms-use-system-libs2.patch
deleted file mode 100644
index 39e62e341794..000000000000
--- a/net-p2p/fms/files/fms-use-system-libs2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- CMakeLists.txt	2012-03-04 13:01:24.000000000 +0100
-+++ CMakeLists.txt.new	2012-03-08 22:14:27.000000000 +0100
-@@ -353,9 +353,16 @@
- ENDIF(AUDIO_CAPTCHA)
- 
- IF(FROST_SUPPORT)
--	ADD_SUBDIRECTORY(libs/polarssl)
--	TARGET_LINK_LIBRARIES(fms polarssl)
--	INCLUDE_DIRECTORIES(libs/polarssl/include)
-+
-+	FIND_LIBRARY(POLARSSL_LIBRARY NAMES polarssl libpolarssl)
-+
-+	IF(POLARSSL_LIBRARY)
-+		TARGET_LINK_LIBRARIES(fms ${POLARSSL_LIBRARY})
-+	ELSE(POLARSSL_LIBRARY)
-+		ADD_SUBDIRECTORY(libs/polarssl)
-+		TARGET_LINK_LIBRARIES(fms polarssl)
-+		INCLUDE_DIRECTORIES(libs/polarssl/include)
-+	ENDIF(POLARSSL_LIBRARY)
- 
- 	ADD_DEFINITIONS(-DFROST_SUPPORT)
- 
diff --git a/net-p2p/fms/files/fms-use-system-libs3.patch b/net-p2p/fms/files/fms-use-system-libs3.patch
new file mode 100644
index 000000000000..32a702511d53
--- /dev/null
+++ b/net-p2p/fms/files/fms-use-system-libs3.patch
@@ -0,0 +1,41 @@
+--- CMakeLists.txt	2016-06-04 21:18:20.000000000 +0200
++++ CMakeLists.txt.new	2017-01-12 17:12:10.000000000 +0100
+@@ -373,11 +373,18 @@
+ ENDIF(AUDIO_CAPTCHA)
+ 
+ IF(FROST_SUPPORT OR FCP_SSL_SUPPORT)
+-	ADD_SUBDIRECTORY(libs/mbedtls)
+-	TARGET_LINK_LIBRARIES(fms mbedtls)
+-	TARGET_LINK_LIBRARIES(fms mbedcrypto)
+-	TARGET_LINK_LIBRARIES(fms mbedx509)
+-	INCLUDE_DIRECTORIES(libs/mbedtls/include)
++
++	FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls )
++	FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto mbedx509)
++	FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509)
++
++	IF(MBEDTLS_LIBRARY)
++		TARGET_LINK_LIBRARIES(fms ${MBEDTLS_LIBRARY})
++		TARGET_LINK_LIBRARIES(fms ${MBEDCRYPTO_LIBRARY})
++		TARGET_LINK_LIBRARIES(fms ${MBEDX509_LIBRARY})
++	ELSE(MBEDTLS_LIBRARY)
++		MESSAGE(FATAL ERROR: "Could not find mbedtls library.")
++	ENDIF(MBEDTLS_LIBRARY)
+ 
+ 	IF(FROST_SUPPORT)
+ 		ADD_DEFINITIONS(-DFROST_SUPPORT)
+@@ -405,3 +412,14 @@
+ IF(BUILD_PLUGIN)
+ 	ADD_SUBDIRECTORY(plugin)
+ ENDIF(BUILD_PLUGIN)
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type      ${CMAKE_BUILD_TYPE}
++Install path    ${CMAKE_INSTALL_PREFIX}
++Compiler flags:
++C               ${CMAKE_C_FLAGS}
++C++             ${CMAKE_CXX_FLAGS}
++Linker flags:
++Executable      ${CMAKE_EXE_LINKER_FLAGS}
++Module          ${CMAKE_MODULE_LINKER_FLAGS}
++Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")
diff --git a/net-p2p/fms/fms-0.3.75.ebuild b/net-p2p/fms/fms-0.3.75.ebuild
deleted file mode 100644
index c3014c21a68f..000000000000
--- a/net-p2p/fms/fms-0.3.75.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils cmake-utils user
-
-DESCRIPTION="A spam-resistant message board application for Freenet"
-HOMEPAGE="http://freenetproject.org/tools.html"
-SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="frost"
-
-RDEPEND="virtual/libiconv
-	frost? ( net-libs/polarssl )
-	>=dev-libs/poco-1.4.3_p1
-	>=dev-db/sqlite-3.6.15"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-	edos2unix src/http/pages/showfilepage.cpp
-	epatch "${FILESDIR}"/${PN}-use-system-libs2.patch
-}
-
-src_configure() {
-	local mycmakeargs="-DI_HAVE_READ_THE_README=ON \
-		-DUSE_BUNDLED_SQLITE=OFF \
-		-DDO_CHARSET_CONVERSION=ON \
-		$(cmake-utils_use frost FROST_SUPPORT)"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	insinto /var/freenet/fms
-	dobin "${CMAKE_BUILD_DIR}"/fms || die
-	doins *.htm || die "doinstall failed"
-	doins -r fonts images styles translations || die
-	fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms
-	fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms
-	doinitd "${FILESDIR}/fms" || die "installing init.d file failed"
-	dodoc readme.txt || die "installing doc failed"
-}
-
-pkg_postinst() {
-	if ! has_version 'net-p2p/freenet' ; then
-		ewarn "FMS needs a freenet node to up-/download #ssages."
-		ewarn "Please make sure to have a node you can connect to"
-		ewarn "or install net-p2p/freenet to get FMS working."
-	fi
-	elog "By default, the FMS NNTP server will listen on port 1119,"
-	elog "and the web configuration interface will be running at"
-	elog "http://localhost:8080. For more information, read"
-	elog "${ROOT}usr/share/doc/${PF}/readme.txt.bz2"
-	if use frost; then
-		elog " "
-		elog "You need to enable frost on the config page"
-		elog "and restart fms for frost support."
-	fi
-}
diff --git a/net-p2p/fms/fms-0.3.73.ebuild b/net-p2p/fms/fms-0.3.79.ebuild
index 4db60f324d86..a7b0bacb46df 100644
--- a/net-p2p/fms/fms-0.3.73.ebuild
+++ b/net-p2p/fms/fms-0.3.79.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="frost"
 
 RDEPEND="virtual/libiconv
-	frost? ( net-libs/polarssl )
+	frost? ( net-libs/mbedtls )
 	>=dev-libs/poco-1.4.3_p1
 	>=dev-db/sqlite-3.6.15"
 DEPEND="${RDEPEND}
@@ -30,8 +30,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	rm -rv  libs
 	edos2unix src/http/pages/showfilepage.cpp
-	epatch "${FILESDIR}"/${PN}-use-system-libs2.patch
+	epatch "${FILESDIR}"/${PN}-use-system-libs3.patch
 }
 
 src_configure() {