Move source from old svn tree to new location and git

(Portage version: 13596-svn/cvs/Linux x86_64)

3 files changed, 15 insertions, 24 deletions

diff --git a/net-mail/Freemail/ChangeLog b/net-mail/Freemail/ChangeLog
index 73ec8a98ad93..80a7d0451e7f 100644
--- a/net-mail/Freemail/ChangeLog
+++ b/net-mail/Freemail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/Freemail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/Freemail/ChangeLog,v 1.3 2009/04/28 17:26:19 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/Freemail/ChangeLog,v 1.4 2009/06/26 14:57:39 tommy Exp $
+
+  26 Jun 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  Freemail-9999.ebuild, files/build.patch:
+  Move source from old svn tree to new location and git
 
   28 Apr 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> Freemail-9999:
   Change the ownership of the pluginsdir to freenet user
diff --git a/net-mail/Freemail/Freemail-9999.ebuild b/net-mail/Freemail/Freemail-9999.ebuild
index 66cbeba3ed16..3ac8f58bb443 100644
--- a/net-mail/Freemail/Freemail-9999.ebuild
+++ b/net-mail/Freemail/Freemail-9999.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-mail/Freemail/Freemail-9999.ebuild,v 1.3 2009/04/28 17:26:19 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/Freemail/Freemail-9999.ebuild,v 1.4 2009/06/26 14:57:39 tommy Exp $
 
 EAPI="2"
 
-ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/apps/Freemail"
-ESVN_OPTIONS="--ignore-externals"
+EGIT_REPO_URI="git://github.com/freenet/plugin-Freemail-official.git"
+EGIT_PROJECT="Freemail/official"
 EANT_BUILD_TARGET="dist"
-inherit eutils java-pkg-2 java-ant-2 subversion
+inherit eutils git java-pkg-2 java-ant-2
 
 DESCRIPTION="Anonymous IMAP/SMTP e-mail server over Freenet"
 HOMEPAGE="http://www.freenetproject.org/tools.html"
@@ -32,18 +32,13 @@ src_prepare() {
 }
 
 src_install() {
-	java-pkg_dojar lib/Freemail.jar
+	java-pkg_dojar dist/Freemail.jar
 	dodir /var/freenet/plugins
 	fperms freenet:freenet /var/freenet/plugins
 	dosym ../../../usr/share/Freemail/lib/Freemail.jar /var/freenet/plugins/Freemail.jar
 	dodoc README || die "installation of documentation failed"
 }
 
-pkg_preinst() {
-	java-pkg-2_pkg_preinst
-	subversion_pkg_preinst
-}
-
 pkg_postinst () {
 	#force chmod for previously existing plugins dir owned by root
 	[[ $(stat --format="%U" /var/freenet/plugins) == "freenet" ]] || chown \
diff --git a/net-mail/Freemail/files/build.patch b/net-mail/Freemail/files/build.patch
index 4ac3a878cdaf..3fef282f74ad 100644
--- a/net-mail/Freemail/files/build.patch
+++ b/net-mail/Freemail/files/build.patch
@@ -1,9 +1,9 @@
---- build.xml	2008-10-08 18:58:11.000000000 +0200
-+++ build.xml.new	2008-10-08 18:59:25.000000000 +0200
-@@ -4,64 +4,8 @@
- 	<property name="src" location="src"/>
+--- build.xml	2009-06-26 16:46:58.829728329 +0200
++++ build.xml.new	2009-06-26 16:48:44.654930593 +0200
+@@ -5,64 +5,7 @@
  	<property name="build" location="build"/>
  	<property name="lib" location="lib"/>
+ 	<property name="dist" location="dist"/>
 -	<property name="deps" location="deps"/>
 -	
 -	<property name="bcdist" value="lcrypto-jdk14-138"/>
@@ -60,17 +60,9 @@
 -			<exclude name="org/bouncycastle/util/AllTests.java" />
 -		</javac>
 -	</target>
- 
+-
 -	<target name="compile" depends="bouncycastle-compile, freenetjar-fetch">
 +	<target name="compile">
  		<mkdir dir="${build}"/>
  
  		<tstamp/>
-@@ -88,6 +33,7 @@
- 			<manifest>
- 				<attribute name="Main-Class" value="freemail.FreemailCli"/>
- 				<attribute name="Plugin-Main-Class" value="freemail.FreemailPlugin"/>
-+				<attribute name="Class-Path" value="/usr/share/bcprov/lib/bcprov.jar /usr/share/freenet/lib/freenet.jar"/>
- 				<attribute name="Built-By" value="${user.name}"/>
- 				<section name="common">
- 					<attribute name="Implementation-Title" value="Freemail"/>