Attachment #291583 for bug #325271

View | Details | Raw Unified | Return to bug 325271 | Differences between
Collapse All | Expand All




#	${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"

LICENSE="EPL-1.0"
RESTRICT="mirror"
SLOT="3.7"
KEYWORDS="~amd64 ~x86"
IUSE="doc gnome source"

	>=dev-java/sat4j-core-2.3.0:2
	>=dev-java/sat4j-pseudo-2.3.0:2
	dev-java/tomcat-servlet-api:2.5
	>=www-servers/tomcat-7:7
	java-virtuals/jetty-server:6
	x86? ( gnome? ( gnome-base/gconf ) )"
RDEPEND="${CDEPEND}
	>=virtual/jre-1.5"

	'org.apache.commons.httpclient - commons-httpclient-3'
#	'org.apache.commons.httpclient jakarta-commons-httpclient-3.1 commons-httpclient-3'
	'org.apache.commons.logging apache-commons-logging commons-logging'
	'org.apache.jasper - tomcat-7 jasper jasper-el'
	'org.apache.lucene.core - lucene-2.9'
#	'org.apache.lucene.core lucene lucene-2.9'
	'org.apache.lucene.analysis - lucene-analyzers-2.9'

ALL_WS='carbon cocoa gtk motif photon win32 wpf'
ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'

pkg_pretend() {
	CHECKREQS_MEMORY="1536M"
	if use doc ; then
		CHECKREQS_DISK_BUILD="3072M"
	else
		CHECKREQS_DISK_BUILD="1536M"
	fi
	check-reqs_pkg_pretend
}

buildDir="${S}/build/eclipse-${BUILD_VER}-src"

pkg_setup() {
	CHECKREQS_MEMORY="1536M"
	if use doc ; then
		CHECKREQS_DISK_BUILD="3072M"
	else
		CHECKREQS_DISK_BUILD="1536M"
	fi

	check-reqs_pkg_setup
	ws='gtk'
	if use x86 ; then os='linux' ; arch='x86'
	elif use amd64 ; then os='linux' ; arch='x86_64'

}

src_unpack() {
	CHECKREQS_MEMORY="1536"
	if use doc ; then
		CHECKREQS_DISK_BUILD="3072"
	else
		CHECKREQS_DISK_BUILD="1536"
	fi
	check_reqs

	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"
	#tar -xpJf "${DISTDIR}/eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}/eclipse-${BUILD_VER}-src.tar.bz2" || die

Return to bug 325271

Lines 26-31 Link Here

(-)eclipse-sdk-3.7.1.ebuild.orig (-11 / +22 lines)
26	# ${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"	26	# ${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
27		27
28	LICENSE="EPL-1.0"	28	LICENSE="EPL-1.0"
		29	RESTRICT="mirror"
29	SLOT="3.7"	30	SLOT="3.7"
30	KEYWORDS="~amd64 ~x86"	31	KEYWORDS="~amd64 ~x86"
31	IUSE="doc gnome source"	32	IUSE="doc gnome source"
Lines 48-55 Link Here
48	>=dev-java/sat4j-core-2.3.0:2	49	>=dev-java/sat4j-core-2.3.0:2
49	>=dev-java/sat4j-pseudo-2.3.0:2	50	>=dev-java/sat4j-pseudo-2.3.0:2
50	dev-java/tomcat-servlet-api:2.5	51	dev-java/tomcat-servlet-api:2.5
51	>=www-servers/jetty-6.1.23:6	52	>=www-servers/tomcat-7:7
52	>=www-servers/tomcat-5.5.17:5.5	53	java-virtuals/jetty-server:6
53	x86? ( gnome? ( gnome-base/gconf ) )"	54	x86? ( gnome? ( gnome-base/gconf ) )"
54	RDEPEND="${CDEPEND}	55	RDEPEND="${CDEPEND}
55	>=virtual/jre-1.5"	56	>=virtual/jre-1.5"
Lines 92-98 Link Here
92	'org.apache.commons.httpclient - commons-httpclient-3'	93	'org.apache.commons.httpclient - commons-httpclient-3'
93	# 'org.apache.commons.httpclient jakarta-commons-httpclient-3.1 commons-httpclient-3'	94	# 'org.apache.commons.httpclient jakarta-commons-httpclient-3.1 commons-httpclient-3'
94	'org.apache.commons.logging apache-commons-logging commons-logging'	95	'org.apache.commons.logging apache-commons-logging commons-logging'
95	'org.apache.jasper - tomcat-5.5 jasper-compiler jasper-runtime'	96	'org.apache.jasper - tomcat-7 jasper jasper-el'
96	'org.apache.lucene.core - lucene-2.9'	97	'org.apache.lucene.core - lucene-2.9'
97	# 'org.apache.lucene.core lucene lucene-2.9'	98	# 'org.apache.lucene.core lucene lucene-2.9'
98	'org.apache.lucene.analysis - lucene-analyzers-2.9'	99	'org.apache.lucene.analysis - lucene-analyzers-2.9'
Lines 138-146 Link Here
138	ALL_WS='carbon cocoa gtk motif photon win32 wpf'	139	ALL_WS='carbon cocoa gtk motif photon win32 wpf'
139	ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'	140	ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'
140		141
		142	pkg_pretend() {
		143	CHECKREQS_MEMORY="1536M"
		144	if use doc ; then
		145	CHECKREQS_DISK_BUILD="3072M"
		146	else
		147	CHECKREQS_DISK_BUILD="1536M"
		148	fi
		149	check-reqs_pkg_pretend
		150	}
		151
141	buildDir="${S}/build/eclipse-${BUILD_VER}-src"	152	buildDir="${S}/build/eclipse-${BUILD_VER}-src"
142		153
143	pkg_setup() {	154	pkg_setup() {
		155	CHECKREQS_MEMORY="1536M"
		156	if use doc ; then
		157	CHECKREQS_DISK_BUILD="3072M"
		158	else
		159	CHECKREQS_DISK_BUILD="1536M"
		160	fi
		161
		162	check-reqs_pkg_setup
144	ws='gtk'	163	ws='gtk'
145	if use x86 ; then os='linux' ; arch='x86'	164	if use x86 ; then os='linux' ; arch='x86'
146	elif use amd64 ; then os='linux' ; arch='x86_64'	165	elif use amd64 ; then os='linux' ; arch='x86_64'
Lines 155-168 Link Here
155	}	174	}
156		175
157	src_unpack() {	176	src_unpack() {
158	CHECKREQS_MEMORY="1536"
159	if use doc ; then
160	CHECKREQS_DISK_BUILD="3072"
161	else
162	CHECKREQS_DISK_BUILD="1536"
163	fi
164	check_reqs
165
166	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"	177	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"
167	#tar -xpJf "${DISTDIR}/eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"	178	#tar -xpJf "${DISTDIR}/eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
168	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}/eclipse-${BUILD_VER}-src.tar.bz2" \|\| die	179	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}/eclipse-${BUILD_VER}-src.tar.bz2" \|\| die