Version bump, drop old

(Portage version: 2.2.0_alpha90-r1/cvs/Linux x86_64)

6 files changed, 33 insertions, 122 deletions

diff --git a/net-p2p/fms/ChangeLog b/net-p2p/fms/ChangeLog
index 4101b5a4fd55..0069eccbf9b7 100644
--- a/net-p2p/fms/ChangeLog
+++ b/net-p2p/fms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/fms
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.27 2012/02/23 21:30:23 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.28 2012/03/08 21:20:24 tommy Exp $
+
+*fms-0.3.66 (08 Mar 2012)
+
+  08 Mar 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> -fms-0.3.65.ebuild,
+  +files/fms-use-system-libs2.patch, -fms-0.3.63-r1.ebuild, +fms-0.3.66.ebuild,
+  -files/fms-fix-includes.patch, -files/fms-use-system-libs.patch:
+  Version bump, drop old
 
 *fms-0.3.65 (23 Feb 2012)
 
diff --git a/net-p2p/fms/files/fms-fix-includes.patch b/net-p2p/fms/files/fms-fix-includes.patch
deleted file mode 100644
index 25fbd3da5983..000000000000
--- a/net-p2p/fms/files/fms-fix-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/keyfinder.h	2011-11-29 19:20:02.000000000 +0100
-+++ include/keyfinder.h.new	2012-02-23 22:12:36.000000000 +0100
-@@ -1,7 +1,7 @@
- #ifndef _keyfinder_

- #define _keyfinder_

- 

--#include "../../../include/http/emoticonreplacer.h"

-+#include "http/emoticonreplacer.h"

- 

- #include <string>

- #include <vector>

diff --git a/net-p2p/fms/files/fms-use-system-libs.patch b/net-p2p/fms/files/fms-use-system-libs.patch
deleted file mode 100644
index 4de777041ebf..000000000000
--- a/net-p2p/fms/files/fms-use-system-libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- CMakeLists.txt	2009-07-24 20:32:12.000000000 +0200
-+++ CMakeLists.txt.new	2009-08-02 21:46:18.048387609 +0200
-@@ -315,12 +315,17 @@
- 		TARGET_LINK_LIBRARIES(fms tommath)

- 		INCLUDE_DIRECTORIES(libs/libtommath)

- 	ENDIF(TOMMATH_LIBRARY)

--	

--	# Force use of bundled tomcrypt, as the system library may have been compiled without the features we need

--	ADD_SUBDIRECTORY(libs/libtomcrypt)

--	TARGET_LINK_LIBRARIES(fms tomcrypt)

--	INCLUDE_DIRECTORIES(libs/libtomcrypt/headers)

--	

-+

-+	FIND_LIBRARY(TOMCRYPT_LIBRARY NAMES tomcrypt libtomcrypt)

-+

-+	IF(TOMCRYPT_LIBRARY)

-+		TARGET_LINK_LIBRARIES(fms ${TOMCRYPT_LIBRARY})

-+	ELSE(TOMCRYPT_LIBRARY)

-+		ADD_SUBDIRECTORY(libs/libtomcrypt)

-+		TARGET_LINK_LIBRARIES(fms tomcrypt)

-+		INCLUDE_DIRECTORIES(libs/libtomcrypt/headers)

-+	ENDIF(TOMCRYPT_LIBRARY)

-+

- 	ADD_DEFINITIONS(-DFROST_SUPPORT)

- 	

- ENDIF(FROST_SUPPORT)

diff --git a/net-p2p/fms/files/fms-use-system-libs2.patch b/net-p2p/fms/files/fms-use-system-libs2.patch
new file mode 100644
index 000000000000..39e62e341794
--- /dev/null
+++ b/net-p2p/fms/files/fms-use-system-libs2.patch
@@ -0,0 +1,22 @@
+--- 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/fms-0.3.63-r1.ebuild b/net-p2p/fms/fms-0.3.63-r1.ebuild
deleted file mode 100644
index afbaf94d94c7..000000000000
--- a/net-p2p/fms/fms-0.3.63-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.63-r1.ebuild,v 1.1 2012/02/13 19:32:12 tommy Exp $
-
-EAPI="2"
-
-inherit eutils cmake-utils
-
-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? ( >=dev-libs/libtomcrypt-1.17-r6 )
-	>=dev-libs/poco-1.2.9
-	>=dev-db/sqlite-3.6.15
-	<dev-libs/libpcre-8.13"
-#added dependency on <=dev-libs/libpcre-8.12 instead of blocking higher versions,
-#to prevent some issues with blocker resolution in portage
-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-libs.patch
-	sed -i "s:LTC_PKCS:LTC_LTC_PKCS:g" src/freenet/frostidentity.cpp
-	sed -i 's:"../../../include/fmsapp.h":"../include/fmsapp.h":' src/*.cpp
-	sed -i 's:"../../../include/fmsapp.h":"../../include/fmsapp.h":' src/*/*.cpp
-}
-
-src_configure() {
-	local mycmakeargs="-DI_HAVE_READ_THE_README=ON \
-		-DUSE_BUNDLED_SQLITE=OFF \
-		-DDO_CHARSET_CONVERSION=ON \
-		$(cmake-utils_use frost FROST_SUPPORT)"
-	use frost && append-flags -DLTM_DESC
-	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.65.ebuild b/net-p2p/fms/fms-0.3.66.ebuild
index f5e7e20e051f..0d05e5dd802b 100644
--- a/net-p2p/fms/fms-0.3.65.ebuild
+++ b/net-p2p/fms/fms-0.3.66.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.65.ebuild,v 1.1 2012/02/23 21:30:23 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.66.ebuild,v 1.1 2012/03/08 21:20:24 tommy Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="frost"
 
 RDEPEND="virtual/libiconv
-	frost? ( >=dev-libs/libtomcrypt-1.17-r6 )
+	frost? ( net-libs/polarssl )
 	>=dev-libs/poco-1.2.9
 	>=dev-db/sqlite-3.6.15
 	<dev-libs/libpcre-8.13"
@@ -34,9 +34,7 @@ pkg_setup() {
 
 src_prepare() {
 	edos2unix src/http/pages/showfilepage.cpp
-	epatch "${FILESDIR}"/${PN}-use-system-libs.patch
-	epatch "${FILESDIR}"/${PN}-fix-includes.patch
-	sed -i "s:LTC_PKCS:LTC_LTC_PKCS:g" src/freenet/frostidentity.cpp
+	epatch "${FILESDIR}"/${PN}-use-system-libs2.patch
 }
 
 src_configure() {
@@ -44,7 +42,6 @@ src_configure() {
 		-DUSE_BUNDLED_SQLITE=OFF \
 		-DDO_CHARSET_CONVERSION=ON \
 		$(cmake-utils_use frost FROST_SUPPORT)"
-	use frost && append-flags -DLTM_DESC
 	cmake-utils_src_configure
 }