Revbump to build sheet component. Remove old version.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64

5 files changed, 48 insertions, 88 deletions

diff --git a/dev-java/l2fprod-common/ChangeLog b/dev-java/l2fprod-common/ChangeLog
index 495428bc82b0..442e6679c278 100644
--- a/dev-java/l2fprod-common/ChangeLog
+++ b/dev-java/l2fprod-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/l2fprod-common
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/ChangeLog,v 1.4 2008/07/20 19:09:03 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/ChangeLog,v 1.5 2008/07/21 21:39:39 serkan Exp $
+
+*l2fprod-common-7.3-r1 (21 Jul 2008)
+
+  21 Jul 2008; Serkan Kaba <serkan@gentoo.org>
+  files/l2fprod-common-6.9.1-nodeps.patch, -l2fprod-common-6.9.1.ebuild,
+  -l2fprod-common-7.3.ebuild, +l2fprod-common-7.3-r1.ebuild:
+  Revbump to build sheet component. Remove old version.
 
 *l2fprod-common-7.3 (20 Jul 2008)
 
diff --git a/dev-java/l2fprod-common/Manifest b/dev-java/l2fprod-common/Manifest
index 14bd4ef0d57f..2ae81f4f338d 100644
--- a/dev-java/l2fprod-common/Manifest
+++ b/dev-java/l2fprod-common/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX l2fprod-common-6.9.1-nodeps.patch 2079 RMD160 3a86d9b14e3ce808b0d5d8b0b431e5bc212e0716 SHA1 6e92d5a8f95c4cc4bcc7ba742f71fd24a2de5e08 SHA256 dc5981580ee108dc13f201f897fd4c99290d70e74ef53469c84340a1ed312947
-DIST l2fprod-common-6.9.1.tar.bz2 457152 RMD160 63ca3c65cec3abb35000e63781c72a395169bdbd SHA1 989bb4bc3619ea537cb2f06de73209f518dba344 SHA256 fde750dcb53467714b79b583b4ee12424d2b3caacfa7aaeca344049985056274
+AUX l2fprod-common-6.9.1-nodeps.patch 1776 RMD160 13370be03a3328246433ae3ea7fc2aaa2b40c69f SHA1 0354682a9c09d1e005dc8d036f4d82d0bc5c032c SHA256 e739d4784cbe28f4e6b275da141e0cdafa670c4d3a0d1bb13119e03819312a76
 DIST l2fprod-common-7.3.tar.bz2 475662 RMD160 153b088f7a1a616d02726840062f3117ca940ce3 SHA1 749a21fdfc386a614b2c4a311febabfc9828bbea SHA256 d774fc617995b584a5d8a73a84f1f0feae45c54a462f8913a86c96846aafef0a
-EBUILD l2fprod-common-6.9.1.ebuild 1071 RMD160 ed4c61c0045a85abbed1810257be2a903c53eccb SHA1 6d66caf5037b6b1eac595725c712ee36dac6e860 SHA256 a6e8d1fdd608ab5bf96c617007ab4234cab6d4f96fc34d6ca2d6d1340cbafbfa
-EBUILD l2fprod-common-7.3.ebuild 1079 RMD160 acaed20613e86a14bae1a33ac5a8cddf4f4684ee SHA1 00ed6853517a16551c0139d303273c096ad5d422 SHA256 9889556505d350ae5cd25bf504a4be067901e15694db2f559ec24527e33f6d7a
-MISC ChangeLog 788 RMD160 8f72981ebd0e0babd428357b3817e7791bb4f56d SHA1 4b55784b439e898dd9edfed7ffc59a19bd7ab7c0 SHA256 93328632bb46296d49b0875140694d2beadf508db502becc919d1095f569c1c5
+EBUILD l2fprod-common-7.3-r1.ebuild 1352 RMD160 caf91dfeec424cfeef3f5d2a05ae21c8fdf4d7ab SHA1 7b3e37c71b745fca59acb1d337efd4336c8a5fb1 SHA256 0eb1695aff57e659c260a910d3f336ad72593067c37934751ac495698f064081
+MISC ChangeLog 1064 RMD160 28655839f8cfe663d4e3b1637734efb802e5edbd SHA1 9c69e6766e02a35f91a0950022b0ac549098b630 SHA256 ac6f3857cc96b21cb48fc65e75225ad3db055f0cbe84c9eca64c08e8f81a9bb1
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiDjV4ACgkQRh6X64ivZaJfxQCeIgwitPjVzuSFgXyJvxEzK5sL
-uQAAnR9okTTHVwHwohOcIt+H/KTO4ylB
-=nDAZ
+iEYEARECAAYFAkiFAisACgkQRh6X64ivZaJTzwCeMsTHyKWpMJf7mAMrSBH2/0pM
+CRwAnioq1jjqIxFbY4sZW5vWXDnWHCWj
+=zAMs
 -----END PGP SIGNATURE-----
diff --git a/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch b/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch
index 88f8928bba59..0ada57e1ed0b 100644
--- a/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch
+++ b/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch
@@ -1,49 +1,37 @@
---- components.xml.orig	2006-09-02 12:44:46.000000000 +0200
-+++ components.xml	2006-10-05 23:43:01.000000000 +0200
-@@ -108,6 +108,7 @@
-     </javadoc>
-   </component>
- 
-+  <!--
-   <component name="sheet"
-              mainclass="com.l2fprod.common.demo.Main">
-     <depend>shared</depend>
-@@ -130,6 +131,7 @@
-       <pathelement location="lib/nachocalendar.jar"/>
-     </classpath>
-   </component>
-+  -->
- 
-   <component name="tasks"
- 	     mainclass="com.l2fprod.common.demo.Main">
-@@ -179,7 +181,7 @@
+--- components.xml	2006-09-02 13:44:46.000000000 +0300
++++ components.xml.patched	2008-07-21 21:57:20.000000000 +0300
+@@ -179,26 +179,6 @@
        <include name="com/l2fprod/common/swing/tips/*.java"/>
      </javadoc>
    </component>
 -
-+  <!--
-   <component name="springrcp">
-     <depend>tasks</depend>
-     <depend>directorychooser</depend>
-@@ -199,6 +201,7 @@
-       <include name="com/l2fprod/common/springrcp/*.java"/>
-     </javadoc>
-   </component>
-+  -->
+-  <component name="springrcp">
+-    <depend>tasks</depend>
+-    <depend>directorychooser</depend>
+-    <external-depend groupId="org.springframework" artifactId="spring-richclient" version="2006.02.19"/>
+-    <external-depend groupId="org.springframework" artifactId="spring" version="1.2.5"/>
+-    <fileset dir="src/java/springrcp" includes="**"/>
+-    <resources>
+-      <fileset dir="src/java/springrcp" includes="**/*.gif,**/*.png,**/*.properties"/>
+-    </resources>
+-    <classpath>
+-      <pathelement location="build/classes/tasks"/>
+-      <pathelement location="build/classes/directorychooser"/>
+-      <pathelement location="lib/spring/spring.jar"/>
+-      <pathelement location="lib/spring/spring-richclient.jar"/>
+-    </classpath>
+-    <javadoc>
+-      <include name="com/l2fprod/common/springrcp/*.java"/>
+-    </javadoc>
+-  </component>
              
    <component name="all"
               mainclass="com.l2fprod.common.demo.Main"
-@@ -208,11 +211,11 @@
-     <fileset dir="src/java/fontchooser" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
-     <fileset dir="src/java/outlookbar" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
-     <fileset dir="src/java/shared" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
--    <fileset dir="src/java/sheet" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
-+    <!--<fileset dir="src/java/sheet" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>-->
+@@ -212,7 +192,6 @@
      <fileset dir="src/java/tasks" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
      <fileset dir="src/java/totd" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
      <fileset dir="src/java/shared" includes="**/Version.java" excludes="**/*.gif,**/*.png,**/*.jpg"/>
 -    <fileset dir="src/java/springrcp" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
-+    <!--<fileset dir="src/java/springrcp" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>-->
      <resources>
        <fileset dir="src/java/buttonbar" includes="**/*.gif,**/*.png,**/*.properties"/>
        <fileset dir="src/java/directorychooser" includes="**/*.gif,**/*.png,**/*.properties"/>
diff --git a/dev-java/l2fprod-common/l2fprod-common-6.9.1.ebuild b/dev-java/l2fprod-common/l2fprod-common-6.9.1.ebuild
deleted file mode 100644
index db599a005125..000000000000
--- a/dev-java/l2fprod-common/l2fprod-common-6.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/l2fprod-common-6.9.1.ebuild,v 1.3 2007/05/07 16:23:09 caster Exp $
-
-WANT_ANT_TASKS="ant-trax"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java/Swing GUI components and libraries for building desktop applications"
-HOMEPAGE="http://common.l2fprod.com/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/jreleaseinfo"
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# do not build springrcp and sheet for now, would bloat the deps a lot
-	# potential USE flag material (spring, calendars deps)
-	epatch "${FILESDIR}/${P}-nodeps.patch"
-
-	cd lib
-	java-pkg_jar-from --build-only jreleaseinfo jreleaseinfo.jar jreleaseinfo-1.2.0.jar
-}
-
-src_compile() {
-	eant init
-	java-ant_bsfix_one build/build4components.xml
-	eant jar
-}
-
-src_install() {
-	java-pkg_dojar build/jars/*.jar
-	dodoc README.txt || die
-}
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r1.ebuild
index bb3f0c7a0b0b..ec085c1cd029 100644
--- a/dev-java/l2fprod-common/l2fprod-common-7.3.ebuild
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/l2fprod-common-7.3.ebuild,v 1.1 2008/07/20 19:09:03 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/l2fprod-common-7.3-r1.ebuild,v 1.1 2008/07/21 21:39:39 serkan Exp $
 
 WANT_ANT_TASKS="ant-trax"
+EAPI="1"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Java/Swing GUI components and libraries for building desktop applications"
@@ -12,9 +13,14 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+COMMON_DEPEND="dev-java/nachocalendar
+	dev-java/jcalendar:1.2"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/jreleaseinfo"
-RDEPEND=">=virtual/jre-1.4"
+	dev-java/jreleaseinfo
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,7 +36,8 @@ src_unpack() {
 src_compile() {
 	eant init
 	java-ant_bsfix_one build/build4components.xml
-	eant jar
+	java-ant_rewrite-classpath build/build4components.xml
+	eant -Dgentoo.classpath="$(java-pkg_getjar nachocalendar nachocalendar.jar):$(java-pkg_getjars jcalendar-1.2)" jar
 }
 
 src_install() {