From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1L5QLx-0000I3-Qx for garchives@archives.gentoo.org; Wed, 26 Nov 2008 19:47:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 153D3E052D; Wed, 26 Nov 2008 19:47:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B71CE052D for ; Wed, 26 Nov 2008 19:47:12 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9E7CD643F9 for ; Wed, 26 Nov 2008 19:47:11 +0000 (UTC) Received: from fordfrog by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1L5QLr-0005DB-QV for gentoo-commits@lists.gentoo.org; Wed, 26 Nov 2008 19:47:10 +0000 From: "Miroslav Sulc (fordfrog)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, fordfrog@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog netbeans-6.5-r1.ebuild X-VCS-Directories: dev-util/netbeans X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Sulc Content-Type: text/plain; charset=utf8 Message-Id: Sender: Miroslav Sulc Date: Wed, 26 Nov 2008 19:47:07 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0630558e-e884-498b-b71f-d24e7f54911c X-Archives-Hash: 5dcc6846e044d8b79c4832e0c840eec8 fordfrog 08/11/26 19:47:07 Modified: ChangeLog netbeans-6.5-r1.ebuild Log: Fixed bug #248904, also fixed problem with visualweb not being installe= d (Portage version: 2.1.6_rc1/cvs/Linux 2.6.27-gentoo x86_64) Revision Changes Path 1.91 dev-util/netbeans/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/= ChangeLog?rev=3D1.91&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/= ChangeLog?rev=3D1.91&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/= ChangeLog?r1=3D1.90&r2=3D1.91 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- ChangeLog 23 Nov 2008 17:46:03 -0000 1.90 +++ ChangeLog 26 Nov 2008 19:47:07 -0000 1.91 @@ -1,6 +1,11 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.90 20= 08/11/23 17:46:03 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.91 20= 08/11/26 19:47:07 fordfrog Exp $ + + 26 Nov 2008; Miroslav =C5=A0ulc + +files/6.5/all-visualweb.insync.JspxSerializer.java.patch, + netbeans-6.5-r1.ebuild: + Fixed bug #248904, also fixed problem with visualweb not being install= ed =20 23 Nov 2008; Miroslav =C5=A0ulc netbeans-6.5-r1.= ebuild: Fixed issues introduced by previous update 1.4 dev-util/netbeans/netbeans-6.5-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/= netbeans-6.5-r1.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/= netbeans-6.5-r1.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/= netbeans-6.5-r1.ebuild?r1=3D1.3&r2=3D1.4 Index: netbeans-6.5-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuil= d,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- netbeans-6.5-r1.ebuild 23 Nov 2008 17:46:03 -0000 1.3 +++ netbeans-6.5-r1.ebuild 26 Nov 2008 19:47:07 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebu= ild,v 1.3 2008/11/23 17:46:03 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebu= ild,v 1.4 2008/11/26 19:47:07 fordfrog Exp $ =20 EAPI=3D"2" WANT_SPLIT_ANT=3D"true" @@ -237,37 +237,65 @@ JAVA_PKG_BSFIX=3D"off" =20 pkg_setup() { - if use netbeans_modules_apisupport && ! ( use netbeans_modules_harness = && use netbeans_modules_ide && use netbeans_modules_java ) ; then - eerror "'apisupport' module requires 'harness', 'ide' and 'java' modul= es" + # direct deps: harness, ide, java + if use netbeans_modules_apisupport && ! ( \ + use netbeans_modules_harness && \ + use netbeans_modules_ide && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon ) ; then + eerror "'apisupport' module requires 'harness', 'ide', 'java' and 'web= svccommon' modules" die fi =20 + # direct deps: ide if use netbeans_modules_cnd && ! use netbeans_modules_ide ; then eerror "'cnd' module requires 'ide' module" die fi =20 - if use netbeans_modules_groovy && ! (use netbeans_modules_gsf && use ne= tbeans_modules_ide && use netbeans_modules_java ) ; then - eerror "'groovy' module requires 'gsf', 'ide' and 'java' modules" + # direct deps: gsf, ide, java + if use netbeans_modules_groovy && ! ( \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon ) ; then + eerror "'groovy' module requires 'gsf', 'ide', 'java' and 'websvccommo= n' modules" die fi =20 + # direct deps: ide if use netbeans_modules_gsf && ! use netbeans_modules_ide ; then eerror "'gsf' module requires 'ide' module" die fi =20 - if use netbeans_modules_identity && ! ( use netbeans_modules_gsf && use= netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_module= s_java ) ; then - eerror "'identity' module requires 'gsf', 'ide', 'j2ee' and 'java' mod= ules" + # direct deps: gsf, ide, j2ee, java + if use netbeans_modules_identity && ! ( \ + use netbeans_modules_groovy && \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide && \ + use netbeans_modules_j2ee && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon ) ; then + eerror "'identity' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'ja= va' and 'websvccommon' modules" die fi =20 - if use netbeans_modules_j2ee && ! ( use netbeans_modules_groovy && use = netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_= java ) ; then - eerror "'j2ee' module requires 'groovy', 'gsf', 'ide' and 'java' modul= es" + # direct deps: groovy, gsf, ide, java + if use netbeans_modules_j2ee && ! ( \ + use netbeans_modules_groovy && \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon ) ; then + eerror "'j2ee' module requires 'groovy', 'gsf', 'ide', 'java' and 'web= svccommon' modules" die fi =20 - if use netbeans_modules_java && ! ( use netbeans_modules_ide && use net= beans_modules_websvccommon ) ; then + # direct deps: ide, websvccommon + if use netbeans_modules_java && ! ( \ + use netbeans_modules_ide && \ + use netbeans_modules_websvccommon ) ; then eerror "'java' module requires 'ide' and 'websvccommon' module" die fi @@ -276,51 +304,95 @@ # needed to build 'mobility' cluster # because of bug http://www.netbeans.org/issues/show_bug.cgi?id=3D15153= 8 'apisupport' cluster is also # needed to build 'mobility' cluster - if use netbeans_modules_mobility && ! ( use netbeans_modules_apisupport= && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans= _modules_java ) ; then - eerror "'mobility' module requires 'apisupport', 'ide', 'j2ee' and 'ja= va' modules" + # direct deps: apisupport, ide, j2ee, java + if use netbeans_modules_mobility && ! ( \ + use netbeans_modules_apisupport && \ + use netbeans_modules_groovy && \ + use netbeans_modules_gsf && \ + use netbeans_modules_harness && \ + use netbeans_modules_ide && \ + use netbeans_modules_j2ee && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon ) ; then + eerror "'mobility' module requires 'apisupport', 'groovy', 'gsf', 'har= ness', 'ide', 'j2ee', 'java' and 'websvccommon' modules" die fi =20 - if use netbeans_modules_nb && ! ( use netbeans_modules_harness && use n= etbeans_modules_ide ) ; then + # direct deps: harness, ide + if use netbeans_modules_nb && ! ( \ + use netbeans_modules_harness && \ + use netbeans_modules_ide ) ; then eerror "'nb' module requires 'harness' and 'ide' module" die fi =20 - if use netbeans_modules_php && ! ( use netbeans_modules_gsf && use netb= eans_modules_ide && use netbeans_modules_websvccommon ) ; then + # direct deps: gsf, ide, websvccommon + if use netbeans_modules_php && ! ( \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide && \ + use netbeans_modules_websvccommon ) ; then eerror "'php' module requires 'gsf', 'ide' and 'websvccommon' modules" die fi =20 - if use netbeans_modules_profiler && ! ( use netbeans_modules_gsf && use= netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_module= s_java ) ; then - eerror "'profiler' module requires 'gsf', 'ide', 'j2ee' and 'java' mod= ules" + # direct deps: gsf, ide, j2ee, java + if use netbeans_modules_profiler && ! ( \ + use netbeans_modules_groovy && \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide && \ + use netbeans_modules_j2ee && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon ) ; then + eerror "'profiler' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'ja= va' and 'websvccommon' modules" die fi =20 + # direct deps: gsf, ide #if use netbeans_modules_ruby && ! ( use netbeans_modules_gsf && use ne= tbeans_modules_ide ) ; then # eerror "'ruby' module requires 'gsf' and 'ide' module" # die #fi =20 - if use netbeans_modules_soa && ! ( use netbeans_modules_gsf && use netb= eans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_jav= a && use netbeans_modules_xml ) ; then - eerror "'soa' module requires 'gsf', 'ide', 'j2ee', 'java' and 'xml' m= odules" + # direct deps: gsf, ide, j2ee, java, xml + if use netbeans_modules_soa && ! ( \ + use netbeans_modules_groovy && \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide && \ + use netbeans_modules_j2ee && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon && \ + use netbeans_modules_xml ) ; then + eerror "'soa' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java', = 'websvccommon' and 'xml' modules" die fi =20 - if use netbeans_modules_visualweb && ! ( use netbeans_modules_gsf && us= e netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modul= es_java ) ; then - eerror "'visualweb' module requires 'gsf', 'ide', 'j2ee' and 'java' mo= dules" + # direct deps: gsf, ide, j2ee, java + if use netbeans_modules_visualweb && ! ( \ + use netbeans_modules_groovy && \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide && \ + use netbeans_modules_j2ee && \ + use netbeans_modules_java && \ + use netbeans_modules_websvccommon ) ; then + eerror "'visualweb' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'j= ava' and 'websvccommon' modules" die fi =20 - if use netbeans_modules_webcommon && ! ( use netbeans_modules_gsf && us= e netbeans_modules_ide ) ; then + # direct deps: gsf, ide + if use netbeans_modules_webcommon && ! ( \ + use netbeans_modules_gsf && \ + use netbeans_modules_ide ) ; then eerror "'webcommon' module requires 'gsf' and 'ide' modules" die fi =20 + # direct deps: ide if use netbeans_modules_websvccommon && ! use netbeans_modules_ide ; th= en eerror "'websvccommon' module requires 'ide' module" die fi =20 + # direct deps: ide if use netbeans_modules_xml && ! use netbeans_modules_ide ; then eerror "'xml' module requires 'ide' module" die @@ -341,6 +413,11 @@ epatch "${FILESDIR}"/${SLOT}/nbbuild_build.xml.patch \ "${FILESDIR}"/${SLOT}/nbbuild_templates_projectized.xml.patch =20 + if use netbeans_modules_visualweb ; then + cd ${S}/visualweb.insync/src/org/netbeans/modules/visualweb/insync/mar= kup || die + epatch "${FILESDIR}"/${SLOT}/all-visualweb.insync.JspxSerializer.java.= patch + fi + # Clean up nbbuild einfo "Removing prebuilt *.class files from nbbuild" find "${S}" -name "*.class" -delete @@ -453,6 +530,7 @@ use netbeans_modules_profiler && clusters=3D"${clusters},nb.cluster.pro= filer" #use netbeans_modules_ruby && clusters=3D"${clusters},nb.cluster.ruby" use netbeans_modules_soa && clusters=3D"${clusters},nb.cluster.soa" + use netbeans_modules_visualweb && clusters=3D"${clusters},nb.cluster.vi= sualweb" use netbeans_modules_webcommon && clusters=3D"${clusters},nb.cluster.we= bcommon" use netbeans_modules_websvccommon && clusters=3D"${clusters},nb.cluster= .websvccommon" use netbeans_modules_xml && clusters=3D"${clusters},nb.cluster.xml"