From: Joshua Nichols Date: Sun, 8 Oct 2006 15:04:43 +0000 (+0000) Subject: Made branded splash depend on branding use flag. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe9b30a0cda98fad10e88f0e2cee7596df55011c;p=gentoo.git Made branded splash depend on branding use flag. Package-Manager: portage-2.1.2_pre2 --- diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog index c05104e8de60..95844f0b3018 100644 --- a/dev-util/eclipse-sdk/ChangeLog +++ b/dev-util/eclipse-sdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/eclipse-sdk # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.115 2006/10/08 02:44:39 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.116 2006/10/08 15:04:43 nichoj Exp $ + + 08 Oct 2006; Joshua Nichols + eclipse-sdk-3.2.1-r1.ebuild: + Made branded splash depend on branding use flag. *eclipse-sdk-3.2.1-r1 (08 Oct 2006) diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest index 270ea14aa882..ce6df36b253a 100644 --- a/dev-util/eclipse-sdk/Manifest +++ b/dev-util/eclipse-sdk/Manifest @@ -78,10 +78,10 @@ EBUILD eclipse-sdk-3.1.2-r3.ebuild 10602 RMD160 a2acd26ab238961dda0e7db667874e55 MD5 ee36b3e067bfcc68ad409accd7537d87 eclipse-sdk-3.1.2-r3.ebuild 10602 RMD160 a2acd26ab238961dda0e7db667874e55f0d1ad51 eclipse-sdk-3.1.2-r3.ebuild 10602 SHA256 b133c1f00538d73171189a019125495c6594d442aae0b0ccdf6463e3a9b73b06 eclipse-sdk-3.1.2-r3.ebuild 10602 -EBUILD eclipse-sdk-3.2.1-r1.ebuild 12367 RMD160 5207b23806ebc49da1b2592406ef81b5786a4145 SHA1 75616847582647706dab3596de76738cb476bf00 SHA256 dd865ea318839b78b6e646c52979eb61d9b77b5631c168dc24b24ba0f63d53e8 -MD5 1deec83a0bf216a657841c1e5b6bcd5e eclipse-sdk-3.2.1-r1.ebuild 12367 -RMD160 5207b23806ebc49da1b2592406ef81b5786a4145 eclipse-sdk-3.2.1-r1.ebuild 12367 -SHA256 dd865ea318839b78b6e646c52979eb61d9b77b5631c168dc24b24ba0f63d53e8 eclipse-sdk-3.2.1-r1.ebuild 12367 +EBUILD eclipse-sdk-3.2.1-r1.ebuild 12393 RMD160 44d73934214d4d0bb0b84e525617120fb74eeac7 SHA1 99b1c16bebead9b7dc813cf4afd493a7c63e8256 SHA256 779b373892657bbf9d410e0dad3d3b60f6595892f4f8127fae5d4dbe35f7ccc3 +MD5 7e6577c302eceaa98320511dbdb98384 eclipse-sdk-3.2.1-r1.ebuild 12393 +RMD160 44d73934214d4d0bb0b84e525617120fb74eeac7 eclipse-sdk-3.2.1-r1.ebuild 12393 +SHA256 779b373892657bbf9d410e0dad3d3b60f6595892f4f8127fae5d4dbe35f7ccc3 eclipse-sdk-3.2.1-r1.ebuild 12393 EBUILD eclipse-sdk-3.2.1.ebuild 8989 RMD160 fcfabf4eca82a9ae1b4fa5f4d9d7e652d1cb4763 SHA1 80e4e350fc1ca95342d3ea07960406b45fe2bc99 SHA256 02200dd1a855cd3d34aef655e15714a175256fc5be97a846484d8736617ed61d MD5 515b0143b70f57c9d71b1eb477e1dabd eclipse-sdk-3.2.1.ebuild 8989 RMD160 fcfabf4eca82a9ae1b4fa5f4d9d7e652d1cb4763 eclipse-sdk-3.2.1.ebuild 8989 @@ -90,10 +90,10 @@ EBUILD eclipse-sdk-3.2.ebuild 9467 RMD160 1c5b06efce3b58f57f01d5ccafe433c7bdc756 MD5 b1c5ef3ae89e8239d89765bd444834e2 eclipse-sdk-3.2.ebuild 9467 RMD160 1c5b06efce3b58f57f01d5ccafe433c7bdc7561b eclipse-sdk-3.2.ebuild 9467 SHA256 00c6f86a6f0bd7fd340e8e4ad7948d25b4794cc95899c74c64de91b1370413d2 eclipse-sdk-3.2.ebuild 9467 -MISC ChangeLog 22722 RMD160 58262db15944c0e61ccf31b0b6a6c75b13ac045a SHA1 8caa084e3061acbbe2fad96fd434150c71aef60f SHA256 8f468b56b6a5072f012846db910ed7e8e85d2ff910bf10f96256130c7fdf24d2 -MD5 120b32c4fb245236283a706e9e21cfe9 ChangeLog 22722 -RMD160 58262db15944c0e61ccf31b0b6a6c75b13ac045a ChangeLog 22722 -SHA256 8f468b56b6a5072f012846db910ed7e8e85d2ff910bf10f96256130c7fdf24d2 ChangeLog 22722 +MISC ChangeLog 22855 RMD160 58666d34247fb215a185ad61445fc3d224944f52 SHA1 fc4768a984e54a6166e62d810ec103c296107400 SHA256 c770b6d89968e27c5e9a7025442a58392b48db976f325321a03091bb589c4e0e +MD5 8bf440ee1427e1eceba5dfb1bcdaace6 ChangeLog 22855 +RMD160 58666d34247fb215a185ad61445fc3d224944f52 ChangeLog 22855 +SHA256 c770b6d89968e27c5e9a7025442a58392b48db976f325321a03091bb589c4e0e ChangeLog 22855 MISC metadata.xml 782 RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 SHA1 17bc63605d0a30dca27521cf908a69c0996eab07 SHA256 a1e6bbc5427799b8607d355e3e09ce7d4de98f2a365417ec158eb56f4f00746f MD5 8de14dda7d318d8fb514fdbcecd4058b metadata.xml 782 RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 metadata.xml 782 diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r1.ebuild index 27b270551f11..62b1fcaae951 100644 --- a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r1.ebuild +++ b/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r1.ebuild,v 1.1 2006/10/08 02:44:39 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r1.ebuild,v 1.2 2006/10/08 15:04:43 nichoj Exp $ inherit eutils java-pkg-2 flag-o-matic check-reqs multilib @@ -10,7 +10,7 @@ DESCRIPTION="Eclipse Tools Platform" HOMEPAGE="http://www.eclipse.org/" SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-${PV}-${DATESTAMP}/${MY_A} mirror://gentoo/${PF}-patches.tar.bz2" -IUSE="seamonkey gnome cairo opengl" +IUSE="branding cairo gnome opengl seamonkey " SLOT="3.2" LICENSE="EPL-1.0" # TODO might be able to have ia64 and ppc64 support @@ -173,7 +173,7 @@ apply-patchset() { # %patch24 -p0 epatch ${WORKDIR}/${P}-fileinitializer.patch popd >/dev/null - + ## ## FIXME: breaks!! ## @@ -219,7 +219,7 @@ apply-patchset() { # %patch46 # epatch ${WORKDIR}/${P}-libswt-xpcomgcc4.patch popd >/dev/null - + # Because the launcher source is zipped up, we need to unzip, patch, and re-pack mkdir launchertmp unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip >/dev/null || die "unzip failed" @@ -232,7 +232,7 @@ apply-patchset() { popd >/dev/null mv launchersrc.zip plugins/org.eclipse.platform rm -rf launchertmp - + pushd features/org.eclipse.platform.launchers >/dev/null # %patch47 -p1 epatch ${WORKDIR}/${P}-launcher-link.patch @@ -245,32 +245,32 @@ apply-patchset() { plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt \ plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ plugins/org.eclipse.pde.doc.user/pdeOptions \ - plugins/org.eclipse.platform.doc.isv/platformOptions.txt + plugins/org.eclipse.platform.doc.isv/platformOptions.txt # Always generate debug info when building RPMs (Andrew Haley) # %patch49 -p0 epatch ${WORKDIR}/${P}-ecj-rpmdebuginfo.patch - + # generic releng plugins that can be used to build plugins - # see this thread for deails: + # see this thread for deails: # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html pushd plugins/org.eclipse.pde.build >/dev/null # %patch53 epatch ${WORKDIR}/${P}-pde.build-add-package-build.patch sed --in-place "s:@eclipse_base@:%{_datadir}/%{name}:" templates/package-build/build.properties popd >/dev/null - + # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191536 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=142861 pushd plugins/org.eclipse.swt/Eclipse\ SWT >/dev/null - # %patch54 + # %patch54 epatch ${WORKDIR}/${P}-swt-rm-ON_TOP.patch popd >/dev/null - + # We need to disable junit4 and apt until GCJ can handle Java5 code # %patch55 -p0 epatch ${WORKDIR}/${P}-disable-junit4-apt.patch rm plugins/org.junit4/junit-4.1.jar - + ## ## FIXME: breaks!! ## @@ -293,7 +293,7 @@ apply-patchset() { #mv Eclipse_SWT_PI "Eclipse SWT PI" #popd >/dev/null #pushd plugins/org.eclipse.swt.tools >/dev/null - #mv "JNI Generation" JNI_Generation + #mv "JNI Generation" JNI_Generation ## %patch60 #epatch ${WORKDIR}/${P}-swt-firefox.2.patch #mv JNI_Generation "JNI Generation" @@ -308,12 +308,14 @@ apply-patchset() { # %patch100 -p0 epatch ${WORKDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch popd >/dev/null - - pushd plugins/org.eclipse.platform >/dev/null - cp ${WORKDIR}/splash.bmp . - popd >/dev/null - - # FIXME this should be patched upstream with a flag to turn on and off + + if use branding; then + pushd plugins/org.eclipse.platform >/dev/null + cp ${WORKDIR}/splash.bmp . + popd >/dev/null + fi + + # FIXME this should be patched upstream with a flag to turn on and off # all output should be directed to stdout find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \; }