Version bump, drop old versions

Package-Manager: portage-2.2_rc33-r5/cvs/Linux x86_64

7 files changed, 30 insertions, 180 deletions

diff --git a/net-p2p/fms/ChangeLog b/net-p2p/fms/ChangeLog
index 1d7364f91ec5..03a2b13a43c9 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.12 2009/06/26 15:13:45 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.13 2009/08/02 21:26:00 tommy Exp $
+
+*fms-0.3.41 (02 Aug 2009)
+
+  02 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -fms-0.3.39.ebuild, -fms-0.3.40.ebuild, +fms-0.3.41.ebuild,
+  files/fms-use-system-libs.patch:
+  Version bump, drop old versions
 
 *fms-0.3.40 (26 Jun 2009)
 
diff --git a/net-p2p/fms/files/fms-use-system-libs.patch b/net-p2p/fms/files/fms-use-system-libs.patch
index 3d963bd5c123..4de777041ebf 100644
--- a/net-p2p/fms/files/fms-use-system-libs.patch
+++ b/net-p2p/fms/files/fms-use-system-libs.patch
@@ -1,15 +1,18 @@
---- CMakeLists.txt	2009-04-04 16:20:16.000000000 +0200
-+++ CMakeLists.txt.new	2009-04-08 15:42:06.000000000 +0200
-@@ -294,10 +294,15 @@
+--- 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)

@@ -17,6 +20,7 @@
 +		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/fms-0.3.40.ebuild b/net-p2p/fms/fms-0.3.40.ebuild
deleted file mode 100644
index 5417c01f6684..000000000000
--- a/net-p2p/fms/fms-0.3.40.ebuild
+++ /dev/null
@@ -1,74 +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.40.ebuild,v 1.1 2009/06/26 15:13:45 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"
-
-DEPEND="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* )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-	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 {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 -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.39.ebuild b/net-p2p/fms/fms-0.3.41.ebuild
index 06d46fb10c97..44ea522f70b6 100644
--- a/net-p2p/fms/fms-0.3.39.ebuild
+++ b/net-p2p/fms/fms-0.3.41.ebuild
@@ -1,6 +1,6 @@
 # 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.39.ebuild,v 1.2 2009/06/26 15:13:45 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.41.ebuild,v 1.1 2009/08/02 21:26:00 tommy Exp $
 
 EAPI="2"
 
diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index f6d70ca76d62..0c5d81ed7e28 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.63 2009/07/08 20:22:21 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.64 2009/08/02 21:22:52 tommy Exp $
+
+*freenet-0.7.5_p1227 (02 Aug 2009)
+
+  02 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1222.ebuild, -freenet-0.7_p1223.ebuild,
+  +freenet-0.7.5_p1227.ebuild:
+  Version bump, drop old versions
 
 *freenet-0.7_p1223 (08 Jul 2009)
 
diff --git a/net-p2p/freenet/freenet-0.7_p1223.ebuild b/net-p2p/freenet/freenet-0.7.5_p1227.ebuild
index 551b925cc823..545219a2946b 100644
--- a/net-p2p/freenet/freenet-0.7_p1223.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1227.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7_p1223.ebuild,v 1.1 2009/07/08 20:22:21 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1227.ebuild,v 1.1 2009/08/02 21:22:52 tommy Exp $
 
 EAPI="1"
 DATE=20090708
 
 EGIT_REPO_URI="git://github.com/freenet/fred-staging.git"
 EGIT_PROJECT="freenet/fred-staging"
-EGIT_TREE="ba734379c06664db58e39e763e25e541ba90b6d1"
+EGIT_TREE="c5009c153b0745ad19f16e478fc619a8864d241c"
 
 inherit eutils git java-pkg-2 java-ant-2 multilib
 
diff --git a/net-p2p/freenet/freenet-0.7_p1222.ebuild b/net-p2p/freenet/freenet-0.7_p1222.ebuild
deleted file mode 100644
index 558694284179..000000000000
--- a/net-p2p/freenet/freenet-0.7_p1222.ebuild
+++ /dev/null
@@ -1,94 +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/freenet/freenet-0.7_p1222.ebuild,v 1.1 2009/06/12 19:24:38 tommy Exp $
-
-EAPI="1"
-DATE=20090612
-
-EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
-EGIT_PROJECT="freenet/fred-official"
-EGIT_TREE="139df10e20d9ae4a8afc0ff23f16ba56ec69e011"
-
-inherit eutils git java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="freemail"
-
-CDEPEND="dev-db/db-je:3.3
-	dev-java/fec
-	dev-java/java-service-wrapper
-	dev-java/db4o-jdk11
-	dev-java/db4o-jdk12
-	dev-java/db4o-jdk5
-	dev-java/ant-core
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
-	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
-	java-ant_rewrite-classpath
-}
-
-src_install() {
-	java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.jar
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-	dodoc AUTHORS README || die
-	insinto /etc
-	doins freenet-wrapper.conf || die
-	insinto /var/freenet
-	doins run.sh || die
-	newins "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-}
-
-pkg_postinst () {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if [ -z has_version ]; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}