gentoo resync : 24.12.2018

5 files changed, 125 insertions, 4 deletions

diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 726220a2a1c8..0f6000ee425d 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,5 +1,8 @@
-AUX fms 864 BLAKE2B 18e354b091bf34921c41f7044e0af4ada63cb8b8052cad11696825dbda6b1bc764eec40e35e84808d00593001fede852d2c9aaa831f511efd8c26d2a5c7802dc SHA512 317e29e3b248eb3881dc29861d3afe68750d3283960f622be5259ea5e35bfd8f13d7ade62ef4ca38d7f7e8e964e1a3c75f4f86626c1f4a1f65a0073063fd6c01
+AUX fms 956 BLAKE2B 446660bbd62a4c094ce902e45733bc3e32c4952f2767fc4a5b9a9d51e6e28c95bd3ab78f10a8cfdac8655fbf5673712580b359f4cbcd0873e7dd202a031a5b96 SHA512 376a4ea1f5ac62960e3b04e7b70e12ee25587c9f99bfd50b207e3bc4ea811c520c5237ec96ab60c41a8c80990174dcaf068e55564e14ca7d4be98bab33635545
 AUX fms-use-system-libs3.patch 1380 BLAKE2B 3c2c5023b83099a5a90a5e6b8f583e7d1479e47080e543af525878b79b5c2d9101e2f69aa95f867a24959d1d404bb2d1dfa70c930db814f3bec2aba3ec03ad50 SHA512 5eaf4f455a1b6b65e2f71a2371382710d435a2fdc7379244019951622dcdd8ed6677c0fe3061aacff419cc186a8c8b0169f1949445c6af8bd2577f57051527bc
+AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4d9f8f2d564d28d85e817ed4fc8165cebdaa150ecece8c88197d2b5bb7d31a690f84198bad89e9cb7df63a5d57f65 SHA512 36aa556661db38813021e6e4ef2ebc6f3b4e06aa400f774281766579fa21da9583d87a27aef3c7b68c840bec7c69b99aebd237ba25c42fc5732a66b10d4ed20d
 DIST fms-src-0.3.79.zip 3847775 BLAKE2B e6087ef6e0e22f79e3d399f08ed531e839faf8199bdb3d0c0e148553dd6b7cab9dd35dbc74081a628d4456fadc4f9dd83a7a767f1dab8ac511f94eac1685d2ee SHA512 aa9f505c5ef55b1f462b16de6d870d02dc102fd184cc353c6c6b8a346978a9953b34e878f262f4190a3d15d76c5a37f065c4e5ebdbc0e43a4a5c22d61fa9fba7
+DIST fms-src-0.3.80.zip 4583891 BLAKE2B 363fe148c622d999398d2f435f49e312d3bea22ad6b69865a618593616b47b632c1a56bcc8fc75bd40590e3858aad7e3f1d70991a21936e38562e10f1813b49c SHA512 d3aa5eb7d417bb135d88a515702fac9c451054d071374bb7f475add9af7e1fda90f4d9c61569e3e9040b2a241efa7fcc7ecac32a7f652327d15ed8d1ea1418c4
 EBUILD fms-0.3.79.ebuild 1980 BLAKE2B 0dafbb4351f23e1110718ad2c4a5fe6552e4ebe65974bfeb750f4bd75aaf1b5be081e432d5305c136777b5b5c25da1e14a96a269bb6e4be9512fc357c0be0846 SHA512 e3a43a8f6927c5c7bec169edb828a5aba97407549461e2a4909cef4f9685076d5f2d52a93a1cde287b762814f73ebbaa061ec82c844ba3f98e8d85fd3c394f4a
-MISC metadata.xml 328 BLAKE2B 9b6758ca6b21a1d1884f52f2b95619546bdf3099098424d010cb43124e3d5b66e8c8fe0c44e158c6538fc78596954fc4f05465620dc64db5cce0f62533b412fe SHA512 2346bb04ab74946a53af785c770e3d7cb40d1cbd69010ecb515975c8df60a75ca0e777abf834e3f3de98e4046d5f8ef615349f8cc11fb6093dc87a140c3b08c7
+EBUILD fms-0.3.80.ebuild 2105 BLAKE2B 8af79924d40f4deed95f5929bbe193c6462e4e22243b5c4c73e508e9cf212eceb3475e5902287c0c5ff3a303c8ca704db70253f8ac94d8deb2e1bb45a36efeb6 SHA512 0da40cde3789f19ad7575c53fc9866c5c98f03f9606d04a36362c49d95c749b3ffc960ea3da7cd4fc60b37d0245dd5985d54b15fb30a407f08d50237d56484ad
+MISC metadata.xml 394 BLAKE2B a6924fe829c9abc8b3a04106d30b34af326d4596eb5bc9a96165db2ba1993a4157fdecfbeedc0f0a27b75c6327b501a67de3e46864ec4d7fe6211731fd2e121c SHA512 f4943a8b16ff6b031cf95eb5aaabe12fc18abc349f566fc7d4a4eab155ad917e9d49ebb5fcaafa0e36239d772d24391f1489ad71649ff33554f3a8fb6bdd69b7
diff --git a/net-p2p/fms/files/fms b/net-p2p/fms/files/fms
index 07f1a0551637..d98f3b29e4a8 100644
--- a/net-p2p/fms/files/fms
+++ b/net-p2p/fms/files/fms
@@ -1,6 +1,7 @@
 #!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.4 2010/03/31 19:19:27 tommy Exp $
 
 # Check for OpenRC/Baselayout 2 - see bug #270646
 is_openrc() {
diff --git a/net-p2p/fms/files/fms-use-system-libs4.patch b/net-p2p/fms/files/fms-use-system-libs4.patch
new file mode 100644
index 000000000000..fc017ce0023b
--- /dev/null
+++ b/net-p2p/fms/files/fms-use-system-libs4.patch
@@ -0,0 +1,40 @@
+--- /CMakeLists.txt	2016-06-04 22:18:20.000000000 +0200
++++ /CMakeLists.txt.new	2018-11-25 14:05:45.000000000 +0100
+@@ -373,11 +373,17 @@
+ 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 +411,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.80.ebuild b/net-p2p/fms/fms-0.3.80.ebuild
new file mode 100644
index 000000000000..1b85e8e83668
--- /dev/null
+++ b/net-p2p/fms/fms-0.3.80.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ssl"
+
+RDEPEND="virtual/libiconv
+	frost? ( net-libs/mbedtls )
+	ssl? ( net-libs/mbedtls )
+	>=dev-libs/poco-1.4.3_p1
+	>=dev-db/sqlite-3.6.15"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${PN}-use-system-libs4.patch )
+
+pkg_setup() {
+	enewgroup freenet
+	enewuser freenet -1 -1 /var/freenet freenet
+}
+
+src_prepare() {
+	rm -rv  libs
+	edos2unix src/http/pages/showfilepage.cpp
+	edos2unix CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( -DI_HAVE_READ_THE_README=ON \
+		-DUSE_BUNDLED_SQLITE=OFF \
+		-DDO_CHARSET_CONVERSION=ON \
+		-DFROST_SUPPORT=$(use frost && echo ON || echo OFF) \
+		-DFCP_SSL_SUPPORT=$(use ssl && echo ON || echo OFF) )
+	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/metadata.xml b/net-p2p/fms/metadata.xml
index 2f2a55f2853b..225e63002744 100644
--- a/net-p2p/fms/metadata.xml
+++ b/net-p2p/fms/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 	<use>
-		<flag name="frost">Add support for frost boards</flag>
+		<flag name='frost'>Add support for frost boards</flag>
+		<flag name="ssl">Add support for FCP connection over SSL</flag>
 	</use>
 </pkgmetadata>