* [gentoo-commits] gentoo-x86 commit in net-p2p/phex: ChangeLog phex-3.2.0.102-r1.ebuild
@ 2010-07-10 15:18 Stanislav Ochotnicky (sochotnicky)
0 siblings, 0 replies; 2+ messages in thread
From: Stanislav Ochotnicky (sochotnicky) @ 2010-07-10 15:18 UTC (permalink / raw
To: gentoo-commits
sochotnicky 10/07/10 15:18:23
Modified: ChangeLog phex-3.2.0.102-r1.ebuild
Log:
Move file removal from patch to ebuild to prevent failure on some
systems
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.16 net-p2p/phex/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 18 Jun 2010 21:10:52 -0000 1.15
+++ ChangeLog 10 Jul 2010 15:18:22 -0000 1.16
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/phex
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.15 2010/06/18 21:10:52 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.16 2010/07/10 15:18:22 sochotnicky Exp $
+
+ 10 Jul 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+ files/0001-Remove-MacOS-GUI-references.patch, phex-3.2.0.102-r1.ebuild:
+ Move file removal from patch to ebuild to prevent failure on some systems
*phex-3.2.0.102-r1 (18 Jun 2010)
1.2 net-p2p/phex/phex-3.2.0.102-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild?r1=1.1&r2=1.2
Index: phex-3.2.0.102-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phex-3.2.0.102-r1.ebuild 18 Jun 2010 21:10:52 -0000 1.1
+++ phex-3.2.0.102-r1.ebuild 10 Jul 2010 15:18:22 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild,v 1.1 2010/06/18 21:10:52 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild,v 1.2 2010/07/10 15:18:22 sochotnicky Exp $
EAPI=2
@@ -39,6 +39,8 @@
src_prepare() {
# remove parts related to MacOS gui classes
epatch "${FILESDIR}/0001-Remove-MacOS-GUI-references.patch"
+ # remove unused class (make sure it's not compiled)
+ rm -vf src/phex/gui/macosx/MacOsxGUIUtils.java
rm -vf lib/*.jar || die
# avoid patches like plague
^ permalink raw reply [flat|nested] 2+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-p2p/phex: ChangeLog phex-3.2.0.102-r1.ebuild
@ 2010-06-18 21:10 Stanislav Ochotnicky (sochotnicky)
0 siblings, 0 replies; 2+ messages in thread
From: Stanislav Ochotnicky (sochotnicky) @ 2010-06-18 21:10 UTC (permalink / raw
To: gentoo-commits
sochotnicky 10/06/18 21:10:52
Modified: ChangeLog
Added: phex-3.2.0.102-r1.ebuild
Log:
Remove MacOS GUI related calls (#298698)
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.15 net-p2p/phex/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 22 Jan 2008 22:09:48 -0000 1.14
+++ ChangeLog 18 Jun 2010 21:10:52 -0000 1.15
@@ -1,6 +1,12 @@
# ChangeLog for net-p2p/phex
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.14 2008/01/22 22:09:48 betelgeuse Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.15 2010/06/18 21:10:52 sochotnicky Exp $
+
+*phex-3.2.0.102-r1 (18 Jun 2010)
+
+ 18 Jun 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+ +files/0001-Remove-MacOS-GUI-references.patch, +phex-3.2.0.102-r1.ebuild:
+ Remove MacOS GUI related calls (#298698)
22 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> phex-3.2.0.102.ebuild:
Migrate to EAPI=1 slot deps.
1.1 net-p2p/phex/phex-3.2.0.102-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild?rev=1.1&content-type=text/plain
Index: phex-3.2.0.102-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild,v 1.1 2010/06/18 21:10:52 sochotnicky Exp $
EAPI=2
inherit java-pkg-2 java-ant-2
MY_P="${PN}_${PV}"
DESCRIPTION="java gnutella file-sharing application"
HOMEPAGE="http://phex.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
COMMON_DEPEND="dev-java/commons-httpclient:3
dev-java/commons-logging:0
dev-java/jgoodies-forms:0
dev-java/jgoodies-looks:2.0
dev-java/log4j:0
dev-java/l2fprod-common:0
dev-java/commons-beanutils:1.7
dev-java/commons-codec:0
dev-java/commons-collections:0
dev-java/commons-lang:2.1"
DEPEND="app-arch/unzip
>=virtual/jdk-1.5
${COMMON_DEPEND}"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEPEND}"
S="${WORKDIR}/${MY_P}_src"
JAVA_PKG_BSFIX="off"
src_prepare() {
# remove parts related to MacOS gui classes
epatch "${FILESDIR}/0001-Remove-MacOS-GUI-references.patch"
rm -vf lib/*.jar || die
# avoid patches like plague
sed -i "s/createJar, copyThirdpartyJars/createJar/" build/buildJava.xml || die
JAVA_ANT_REWRITE_CLASSPATH="true" java-ant_bsfix_files build/*.xml
# remove bundled packages that we have - bug #176739
rm -rf src/com/l2fprod src/org/apache || die
}
src_compile() {
local gcp="$(java-pkg_getjars commons-httpclient-3,commons-logging,jgoodies-forms,jgoodies-looks-2.0,log4j,l2fprod-common,commons-beanutils-1.7,commons-codec,commons-collections,commons-lang-2.1)"
cd build
eant -Dgentoo.classpath="${gcp}:MRJAdapter.jar" -Dproject.buildtarget=build buildJava
}
src_install() {
java-pkg_dojar build/lib/${PN}.jar
java-pkg_dolauncher ${PN} --main phex.Main
dohtml docs/readme/* || die
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-10 15:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-10 15:18 [gentoo-commits] gentoo-x86 commit in net-p2p/phex: ChangeLog phex-3.2.0.102-r1.ebuild Stanislav Ochotnicky (sochotnicky)
-- strict thread matches above, loose matches on Subject: below --
2010-06-18 21:10 Stanislav Ochotnicky (sochotnicky)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox