Version bump, drop old

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

3 files changed, 18 insertions, 76 deletions

diff --git a/net-p2p/fms/ChangeLog b/net-p2p/fms/ChangeLog
index 7eb7fecac936..416e2cb7f791 100644
--- a/net-p2p/fms/ChangeLog
+++ b/net-p2p/fms/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-p2p/fms
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.24 2011/06/30 20:32:11 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.25 2011/11/19 18:12:10 tommy Exp $
+
+  19 Nov 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> -fms-0.3.58.ebuild,
+  -fms-0.3.61.ebuild, +fms-0.3.63.ebuild:
+  Drop old versions
+
+*fms-0.3.63 (19 Nov 2011)
+
+  19 Nov 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +fms-0.3.63.ebuild:
+  Version bump, thanks to a Gentoo user, who sent me the sed lines
+  and the need for <=dev-libs/libpcre-8.12
 
 *fms-0.3.61 (30 Jun 2011)
 
diff --git a/net-p2p/fms/fms-0.3.61.ebuild b/net-p2p/fms/fms-0.3.61.ebuild
deleted file mode 100644
index 02da80a3826d..000000000000
--- a/net-p2p/fms/fms-0.3.61.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.61.ebuild,v 1.1 2011/06/30 20:32:11 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-r3[libtommath] )
-	>=dev-libs/poco-1.2.9
-	|| ( >=dev-db/sqlite-3.6.15 =dev-db/sqlite-3.6.13* =dev-db/sqlite-3.6.12* =dev-db/sqlite-3.6.11* =dev-db/sqlite-3.6.6.2* )"
-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
-}
-
-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.58.ebuild b/net-p2p/fms/fms-0.3.63.ebuild
index a3ffea0e9f4d..1c9fb69e4dea 100644
--- a/net-p2p/fms/fms-0.3.58.ebuild
+++ b/net-p2p/fms/fms-0.3.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.58.ebuild,v 1.2 2011/06/14 17:36:54 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.63.ebuild,v 1.1 2011/11/19 18:12:10 tommy Exp $
 
 EAPI="2"
 
@@ -18,7 +18,10 @@ IUSE="frost"
 RDEPEND="virtual/libiconv
 	frost? ( >=dev-libs/libtomcrypt-1.17-r3[libtommath] )
 	>=dev-libs/poco-1.2.9
-	|| ( >=dev-db/sqlite-3.6.15 =dev-db/sqlite-3.6.13* =dev-db/sqlite-3.6.12* =dev-db/sqlite-3.6.11* =dev-db/sqlite-3.6.6.2* )"
+	>=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"
 
@@ -33,6 +36,8 @@ 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() {