Version bump, remove old

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64

6 files changed, 66 insertions, 81 deletions

diff --git a/net-p2p/fms/ChangeLog b/net-p2p/fms/ChangeLog
index ef6d33ebef28..151809061604 100644
--- a/net-p2p/fms/ChangeLog
+++ b/net-p2p/fms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/fms
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.6 2009/03/01 03:10:43 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.7 2009/03/19 18:46:14 tommy Exp $
+
+*fms-0.3.34 (19 Mar 2009)
+
+  19 Mar 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +files/utf8.patch, metadata.xml, -fms-0.3.29.ebuild,
+  -fms-0.3.31-r1.ebuild, +fms-0.3.34.ebuild:
+  Version bump, remove old
 
 *fms-0.3.32 (01 Mar 2009)
 
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index dec678cd4b2c..361e57352696 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -2,20 +2,19 @@
 Hash: SHA1
 
 AUX fms 854 RMD160 42c77644bb8e5f61e8cfe640636347a7b52a5161 SHA1 3574f9998e7f4be4e7627339485f147bb321a2e9 SHA256 afa0e223390af1b3e8cf7ec48f24066293fdc39fdd1657e72d657b49ac1130b3
-DIST fms-src-0.3.29.zip 1280846 RMD160 9e06f5ec10786a70c152bb2f0e8b3d60b4e6fd22 SHA1 13dcdd55184983ef9de571f32b7626ad0cd122a5 SHA256 282d226d0f2af5aba64b7a5b57eeecd1bf50dd62772258cc7dfbe18aae4a3124
-DIST fms-src-0.3.31.zip 1283155 RMD160 b6792af51261776fc587a0a0ad39cc5e98e511ed SHA1 df1447ac7b5dd3387f98431f9786e7d140bb5a26 SHA256 ba96c7e20327930968c22259e404ad678b8911c48b266e9016b81e088e73868c
+AUX utf8.patch 740 RMD160 7edf17c55f1583de614ad1fcae5038b9670d6abd SHA1 d834da1b8cd3956ad52c7b045c2ea2dfeb30495e SHA256 e8da088a956ee6029d51b08d5c87a7a9a07c5c0ae60bfb5e6776b1fe49ed5af7
 DIST fms-src-0.3.32.zip 1351827 RMD160 1285790108d513546125d3c1cbf3177816c839cf SHA1 fc20e4a2edf9aa9fe07720cf9f7b4342373fded4 SHA256 4eb7db4cf818fcdf0aa212e6b28b4b3396d1e39525a34310897481b5ed92be9b
-EBUILD fms-0.3.29.ebuild 1783 RMD160 280505231d5ee2cb6ea57b06f4a69483e5001e13 SHA1 2d9825a16e417383a192c28649ff4c75a81c6bcc SHA256 6a538f35c5e158356d4a9bbc2f5e64cadb1e9d1daf3a657d8b44826b67912b0a
-EBUILD fms-0.3.31-r1.ebuild 1812 RMD160 5747500b9ba0f14e8d7642e5f6c4a1e846309b86 SHA1 75f21c3de7a6a8926d62f1fdda63e2ffad070131 SHA256 e2bbb15b46ee210f69420e15129925ee30ed3beeac940c8a24a157cb0ee1c3e6
+DIST fms-src-0.3.34.zip 1625334 RMD160 c7c3976706c705784a452f0ce8ef4ae7cdec9a68 SHA1 d2021373c421b6ed65111e4d88a042ddcdf4b1fb SHA256 d4e20f0e3545a5c7a14bddcb524655d0225c737c59fc59cf91d3b1440f79aa13
 EBUILD fms-0.3.32.ebuild 1839 RMD160 e3369e1adc594edec01e4ced416bee65e456e0c0 SHA1 6e1978583851e9bc91605bf81cadea719ad6a1b2 SHA256 470d031f44f9e7927b09b9807297de32631bf8c432dcf3a1b033a4e4d9860f42
-MISC ChangeLog 975 RMD160 d8e8863435d7e1e67b9f13977032e7b6f5905375 SHA1 c5967a3f21e06d08dc912aaeceb492e39a1069a1 SHA256 ae8d295281e9bfb59c77e0ec182f81951496d0c38b0821d19e3a7fef442b796e
-MISC metadata.xml 265 RMD160 484daf811121aabac7f645fe502e6e6d844e2f78 SHA1 0e5d4831295b5cb249d8543f6c576a3616fcd66f SHA256 600ca3c5e5331751699a92f10ca336f9f4b39902dfcc7f8d95bcbc41067a6f10
+EBUILD fms-0.3.34.ebuild 2244 RMD160 43a5133e7513bd6be2b746e7e93ea461ef1c4feb SHA1 3b036de8ba4a0ccddea028b6f3801552451fad95 SHA256 d526f95e71ae098b5f15e90571de9039ca1017acf4ae92fba9c8a304c717f456
+MISC ChangeLog 1189 RMD160 a92eb9328cf07088bdb1b37d9dd22e6cc7612861 SHA1 7a6253f0c3976cd6c6274ad29da8277213aba9c4 SHA256 905f97be4cfeb76169c01007ff4af9a1caabb88d63e27d2bb527d2ce2df0282f
+MISC metadata.xml 337 RMD160 59566d1f3d1ea7a7b6edf83370ba568efa134f2a SHA1 f86cdbfd008e059a7bba5e1377de985293a87224 SHA256 fb5fcbc27def922252dcaedaf932f8c49d37d24245f552be3ecf32571b7abfd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iJwEAQECAAYFAkmp/LIACgkQG7kqcTWJkGcoMAQAkCbhvWgYZXzTqo4PkPSvlNVX
-fxTH0fVC5VH/MowDuAClG3tmyzerYm0OnxaPo1WuRQhdU+sVE01GzjP8oq2oEkQm
-gJSdvKfbrpzMQZUh/4B7OX4o7IFq0ljk6qXlGkdKcq3F/HK27AKz3nxgx1hbut1M
-SEKNeaILwLgMvfk9yaM=
-=NGao
+iJwEAQECAAYFAknCkvoACgkQG7kqcTWJkGcbSwQAiGA9TF1zNDEeNUsfcZSVifIK
+TBu/YZ8ocpStSKh/WBvJEldOrGXhxee3XXmKutzqcoPZipfNKfox7ct1Z4CvV87T
+7a4Z+xlfA25R4tMLTi2BmhmY5wZt2AP4HKX+66wjB6VaBqEbOTP1ugAJlqngvA1m
+p2iwnWIDTSI44/Q7DSw=
+=8vy0
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/fms/files/utf8.patch b/net-p2p/fms/files/utf8.patch
new file mode 100644
index 000000000000..1a6c6b8659bd
--- /dev/null
+++ b/net-p2p/fms/files/utf8.patch
@@ -0,0 +1,20 @@
+--- src/unicode/utfconversion.cpp	2009-03-01 12:11:56.000000000 +0100
++++ src/unicode/utfconversion.cpp.new	2009-03-18 22:56:09.000000000 +0100
+@@ -52,7 +52,7 @@
+ 	}

+ 	else

+ 	{

+-		std::vector<uint32_t> dest2(utf8string.size(),0);

++		std::vector<UTF32> dest2(utf8string.size(),0);

+ 		UTF32 *deststart=reinterpret_cast<UTF32 *>(&dest2[0]);

+ 		UTF32 *destend=deststart+dest2.size();

+ 

+@@ -137,7 +137,7 @@
+ 	}

+ 	else

+ 	{

+-		std::vector<uint32_t> source2(wcstring.begin(),wcstring.end());

++		std::vector<UTF32> source2(wcstring.begin(),wcstring.end());

+ 		std::vector<std::string::value_type> dest(wcstring.size()*sizeof(std::wstring::value_type),0);

+ 		

+ 		const UTF32 *sourcestart=reinterpret_cast<const UTF32 *>(&source2[0]);

diff --git a/net-p2p/fms/fms-0.3.29.ebuild b/net-p2p/fms/fms-0.3.29.ebuild
deleted file mode 100644
index dc1060a1b0eb..000000000000
--- a/net-p2p/fms/fms-0.3.29.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.29.ebuild,v 1.1 2009/02/05 18:36:43 tommy Exp $
-
-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=""
-
-DEPEND="virtual/libiconv
-	>=dev-libs/poco-1.2.9
-	=dev-db/sqlite-3.6.6.2*"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_compile() {
-	local mycmakeargs="-DI_HAVE_READ_THE_README=ON \
-		-DUSE_BUNDLED_SQLITE=OFF \
-		-DDO_CHARSET_CONVERSION=ON"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	insinto /var/freenet/fms
-	doins ${PN}_build/fms {forum-,}template.htm || die "doinstall failed"
-	insinto /var/freenet/fms/fonts
-	doins fonts/*.bmp || die "doinstall of fonts failed"
-	insinto /var/freenet/fms/images
-	doins images/*png || die "doinstall of images failed"
-	fperms +x /var/freenet/fms/fms
-	fperms -R o-rwx /var/freenet/fms/
-	fowners -R freenet:freenet /var/freenet/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 messages."
-		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 "${DOCDIR}/readme.txt."
-}
diff --git a/net-p2p/fms/fms-0.3.31-r1.ebuild b/net-p2p/fms/fms-0.3.34.ebuild
index cc4d4d3fadfb..d67a5bde5a5b 100644
--- a/net-p2p/fms/fms-0.3.31-r1.ebuild
+++ b/net-p2p/fms/fms-0.3.34.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.31-r1.ebuild,v 1.1 2009/02/12 18:07:16 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.34.ebuild,v 1.1 2009/03/19 18:46:14 tommy Exp $
+
+EAPI="2"
 
 inherit eutils cmake-utils
 
-DESCRIPTION="A spam-resistant message board application for Freenet"
+DESCRIPTION="A spam-resistant #ssage 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=""
+IUSE="frost"
 
 DEPEND="virtual/libiconv
+	frost? ( >=dev-libs/libtomcrypt-1.17-r3[libtommath] )
 	>=dev-libs/poco-1.2.9
-	=dev-db/sqlite-3.6.6.2*"
+	|| ( =dev-db/sqlite-3.6.6.2* >=dev-db/sqlite-3.6.11 )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
@@ -25,16 +28,23 @@ pkg_setup() {
 	enewuser freenet -1 -1 /var/freenet freenet
 }
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/utf8.patch
+	sed -i "s:LTC_PKCS:LTC_LTC_PKCS:g" src/freenet/frostidentity.cpp
+}
+
+src_configure() {
 	local mycmakeargs="-DI_HAVE_READ_THE_README=ON \
 		-DUSE_BUNDLED_SQLITE=OFF \
-		-DDO_CHARSET_CONVERSION=ON"
-	cmake-utils_src_compile
+		-DDO_CHARSET_CONVERSION=ON \
+		$(cmake-utils_use frost FROST_SUPPORT)"
+	use frost && append-flags -DLTM_DESC
+	cmake-utils_src_configure
 }
 
 src_install() {
-	dobin ${PN}_build/fms || die
 	insinto /var/freenet/fms
+	dobin ${PN}_build/fms || die
 	doins {forum-,}template.htm || die "doinstall failed"
 	insinto /var/freenet/fms/fonts
 	doins fonts/*.bmp || die "doinstall of fonts failed"
@@ -48,12 +58,17 @@ src_install() {
 
 pkg_postinst() {
 	if ! has_version 'net-p2p/freenet' ; then
-		ewarn "FMS needs a freenet node to up-/download messages."
+		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."
+	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 fead1cc4d517..6c6e72a6d9fb 100644
--- a/net-p2p/fms/metadata.xml
+++ b/net-p2p/fms/metadata.xml
@@ -6,5 +6,8 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 	<herd>net-p2p</herd>
+	<use>
+		<flag name='frost'>Add support for frost boards</flag>
+	</use>
 </pkgmetadata>