From: Petteri Räty Date: Sat, 31 Mar 2007 10:06:21 +0000 (+0000) Subject: Cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d6536001badaf8d11b4dd887d190b064e6ef400;p=gentoo.git Cleanup. Package-Manager: portage-2.1.2.2 --- diff --git a/dev-java/glib-java/Manifest b/dev-java/glib-java/Manifest index f7bb6b5e7922..cab74401e52e 100644 --- a/dev-java/glib-java/Manifest +++ b/dev-java/glib-java/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX aclocal_voodoo.patch 749 RMD160 ae731fbbcb529dfb0231f85430aacb912d7040f3 SHA1 4d50db15a8bce78bc45019b98eb1c982d41f8c1e SHA256 5129cfd8bffc258fa132dd2a16a01d0f95c9bd16d437219e5b75e906e38e98ef MD5 6f1550893a37966aca2b2c7ceb220b71 files/aclocal_voodoo.patch 749 RMD160 ae731fbbcb529dfb0231f85430aacb912d7040f3 files/aclocal_voodoo.patch 749 @@ -6,27 +9,26 @@ AUX jg_common-macromagic.patch 482 RMD160 e5bc048435a96c0592aab2a4396985f6d48ea7 MD5 b1e11a9eba5947c307093c7e951155fe files/jg_common-macromagic.patch 482 RMD160 e5bc048435a96c0592aab2a4396985f6d48ea723 files/jg_common-macromagic.patch 482 SHA256 a3bcb5dbee0062864e6d73333925c922e0b4cca488ee8e7021db42f399934296 files/jg_common-macromagic.patch 482 -DIST glib-java-0.2.3.tar.gz 325579 RMD160 5527f17459f326094c09e7b62f38af417e21a45c SHA1 56f1e9ddf1fbaafeb1f57de7ac7f25baccc4a1ff SHA256 7659ca0bb56955ab468ece9229261e0f80eb731eb78a657048230fa907c60a5b DIST glib-java-0.2.6.tar.gz 330765 RMD160 fa88abf782e13d8b7a4177903c9c252055f21fa4 SHA1 b7c3e07d2d3ec6999289fb7c4822927c90d43d2c SHA256 54697e6cabcc2a68a5e7651d3da2c4af068520c6047f490cf9bb1765320b4b10 -EBUILD glib-java-0.2.3-r1.ebuild 2162 RMD160 b15e054b0f157b43b4fbdc56268197d62bc8052d SHA1 6f70f296fd74fcad845a7eef760183b8e2bd5f25 SHA256 ba695530761b7f77bdc2ed56428e75ae75c365fccac93003bcda865c79f9f5bc -MD5 f3b6749a3018d8084a4c765ebff2a534 glib-java-0.2.3-r1.ebuild 2162 -RMD160 b15e054b0f157b43b4fbdc56268197d62bc8052d glib-java-0.2.3-r1.ebuild 2162 -SHA256 ba695530761b7f77bdc2ed56428e75ae75c365fccac93003bcda865c79f9f5bc glib-java-0.2.3-r1.ebuild 2162 EBUILD glib-java-0.2.6-r1.ebuild 385 RMD160 75b1e125a1a1a34fc4809c53f3111e0386317193 SHA1 855165e5686af61b65cb67ef7a92226f663f00d0 SHA256 ba2e3e3e284bb44af300a2351fdd0b1f1188bbbc64c130b24829d585090caaee MD5 40bded146e4b54bd87a733c66fb12739 glib-java-0.2.6-r1.ebuild 385 RMD160 75b1e125a1a1a34fc4809c53f3111e0386317193 glib-java-0.2.6-r1.ebuild 385 SHA256 ba2e3e3e284bb44af300a2351fdd0b1f1188bbbc64c130b24829d585090caaee glib-java-0.2.6-r1.ebuild 385 -MISC ChangeLog 2814 RMD160 d9b19848dfab49e83398ff6ad93e9986e4cfd8a9 SHA1 c4547c5be4d819c90434cfa1df895c579eed7c4a SHA256 d8cfe2ce19c6a543fad51fde28879e03d41eb22b810e993474b7363bf8e6feb6 -MD5 67af70169854a106e4a0827dd25569b5 ChangeLog 2814 -RMD160 d9b19848dfab49e83398ff6ad93e9986e4cfd8a9 ChangeLog 2814 -SHA256 d8cfe2ce19c6a543fad51fde28879e03d41eb22b810e993474b7363bf8e6feb6 ChangeLog 2814 +MISC ChangeLog 2920 RMD160 8361f96c92ea233e90fbeeabb324f0da2b373451 SHA1 cb732f4e02f4d0927343375c15569868d4f35d30 SHA256 c1e660d1d07dc4bbe6b68e63e3d63176c779f5ee9e246ac24533eca3045386ae +MD5 87490ba1780224776498c9b5a72d94f2 ChangeLog 2920 +RMD160 8361f96c92ea233e90fbeeabb324f0da2b373451 ChangeLog 2920 +SHA256 c1e660d1d07dc4bbe6b68e63e3d63176c779f5ee9e246ac24533eca3045386ae ChangeLog 2920 MISC metadata.xml 251 RMD160 694f584a18d47a4cff16db8ae42496f2829c2e97 SHA1 ae5c4821f81d9c2d61f1fe2c1ba2b0cacc9197e6 SHA256 adb4aacc19c29c6e1d42606c7cabaef85edacabf26ef69c1cbc79f4b749351d0 MD5 01c5680508495a6c9737daaa2a47b555 metadata.xml 251 RMD160 694f584a18d47a4cff16db8ae42496f2829c2e97 metadata.xml 251 SHA256 adb4aacc19c29c6e1d42606c7cabaef85edacabf26ef69c1cbc79f4b749351d0 metadata.xml 251 -MD5 6fefbc436dfe3bc884f2587845ee88fe files/digest-glib-java-0.2.3-r1 247 -RMD160 7f2e9be95b15a40aa25ffda3b77a00378e0553d4 files/digest-glib-java-0.2.3-r1 247 -SHA256 780864c68aa4c69d8db86bc0bf78d2d79a20106b96ed62736ac678aa7637d8b0 files/digest-glib-java-0.2.3-r1 247 MD5 4bd770e9f2483962473c11153105b4d9 files/digest-glib-java-0.2.6-r1 247 RMD160 0d1576844d6407b6b56f60491328194be6603eb5 files/digest-glib-java-0.2.6-r1 247 SHA256 bb23cae689269e5290e3b483d8ff52bed431a5bbc60e4f452fce11dea9459288 files/digest-glib-java-0.2.6-r1 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGDjMccxLzpIGCsLQRAo3FAJ9rUyXowMzhxgqRLKGyKeqBIbR78QCeLJZQ +RpFsbH/5Z4NGResjtJNs9ZE= +=TYnn +-----END PGP SIGNATURE----- diff --git a/dev-java/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog index 37e5615999d1..41e7d4e7b189 100644 --- a/dev-java/libgnome-java/ChangeLog +++ b/dev-java/libgnome-java/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/libgnome-java # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.27 2007/02/16 22:21:05 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.28 2007/03/31 10:03:32 betelgeuse Exp $ + + 31 Mar 2007; Petteri Räty + -libgnome-java-2.12.1-r1.ebuild, -libgnome-java-2.12.5.ebuild: + Cleanup. 16 Feb 2007; Petteri Räty libgnome-java-2.12.5-r1.ebuild: diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.12.1-r1 b/dev-java/libgnome-java/files/digest-libgnome-java-2.12.1-r1 deleted file mode 100644 index be000a264af1..000000000000 --- a/dev-java/libgnome-java/files/digest-libgnome-java-2.12.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 30ec2b1404929aabe650e868b5b08ca7 libgnome-java-2.12.1.tar.gz 478475 -RMD160 dbeeee7dbc09b6e7c3f78165c748bf0364faf23a libgnome-java-2.12.1.tar.gz 478475 -SHA256 4d0904b48eb45b6757275286de179b9a578cf71f49b1a156a47ebdfc8fabbbac libgnome-java-2.12.1.tar.gz 478475 diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.12.5 b/dev-java/libgnome-java/files/digest-libgnome-java-2.12.5 deleted file mode 100644 index b9c0e423ac5b..000000000000 --- a/dev-java/libgnome-java/files/digest-libgnome-java-2.12.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0939beef987c13b6d55487b9ad206eb8 libgnome-java-2.12.5.tar.gz 484061 -RMD160 0392ce652a52b7426655f61a139ece25cf6fc162 libgnome-java-2.12.5.tar.gz 484061 -SHA256 17323c8dbf10dc66490649520641080ac59510b6d2f61f910b05c9b4eab32a9f libgnome-java-2.12.5.tar.gz 484061 diff --git a/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild b/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild deleted file mode 100644 index 8bbb510a13b3..000000000000 --- a/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild,v 1.5 2006/09/14 20:20:26 nichoj Exp $ - -# Must be before the gnome.org inherit -GNOME_TARBALL_SUFFIX="gz" -inherit java-pkg eutils gnome.org - -DESCRIPTION="Java bindings for GNOME" -HOMEPAGE="http://java-gnome.sourceforge.net/" - -# Not on gnome.org mirrors yet :-( -SRC_URI="http://research.operationaldynamics.com/linux/java-gnome/dist/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="2.12" -KEYWORDS="amd64 ppc x86" -IUSE="doc gcj source" - -DEPS=">=gnome-base/libgnome-2.10.0 - >=gnome-base/libgnomeui-2.12.0 - >=gnome-base/libgnomecanvas-2.12.0 - >=dev-java/glib-java-0.2.1 - >=dev-java/libgtk-java-2.8.1" - -DEPEND=">=virtual/jdk-1.4 - ${DEPS}" -RDEPEND=">=virtual/jre-1.4 - ${DEPS}" - -JARNAME="gnome${SLOT}.jar" - -pkg_setup() { - java-pkg_pkg_setup - if use gcj ; then - if ! built_with_use sys-devel/gcc gcj ; then - ewarn - ewarn "You must build gcc with the gcj support to build with gcj" - ewarn - ebeep 5 - die "No GCJ support found!" - fi - fi -} - -src_compile() { - # this gcj deal is a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=336149 - local myflags - use gcj || myflags="${myflags} --without-gcj-compile" - econf ${myflags} \ - $(use_with doc javadocs) \ - --with-jardir=/usr/share/${PN}-${SLOT}/lib \ - || die "configure failed" - - emake || die "compile failed" - - # Fix the broken pkgconfig file - sed -i \ - -e "s:classpath.*$:classpath=\${prefix}/share/${PN}-${SLOT}/lib/${JARNAME}:" \ - ${S}/gnome2-java.pc -} - -src_install() { - emake DESTDIR=${D} install || die "install failed" - - # Examples and tutorial as documentation - use doc || rm -rf ${D}/usr/share/doc/${PF}/{examples,tutorial} - - # Use the jars installed by make - # and build our own package.env file. - # NOTE: dojar puts the jar in the wrong place! (/usr/share/${PN}/lib) - cat <<-END > ${D}/usr/share/${PN}-${SLOT}/package.env -DESCRIPTION=${DESCRIPTION} -CLASSPATH=/usr/share/${PN}-${SLOT}/lib/${JARNAME} -END - - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/libgnome-java/libgnome-java-2.12.5.ebuild b/dev-java/libgnome-java/libgnome-java-2.12.5.ebuild deleted file mode 100644 index 8393db7d3ae6..000000000000 --- a/dev-java/libgnome-java/libgnome-java-2.12.5.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.12.5.ebuild,v 1.2 2006/10/26 02:40:04 mr_bones_ Exp $ - -inherit java-gnome - -DESCRIPTION="Java bindings for GNOME" -HOMEPAGE="http://java-gnome.sourceforge.net/" - -SLOT="2.12" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPS=">=gnome-base/libgnome-2.10.0 - >=gnome-base/libgnomeui-2.12.0 - >=gnome-base/libgnomecanvas-2.12.0 - >=dev-java/glib-java-0.2.1 - >=dev-java/libgtk-java-2.8.1" - -DEPEND="${DEPS}" -RDEPEND="${DEPS}" - -JAVA_GNOME_PC="gnome2-java.pc" diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog index 26cadbce0b19..9b7e93aac70f 100644 --- a/dev-java/libgtk-java/ChangeLog +++ b/dev-java/libgtk-java/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/libgtk-java # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.29 2007/02/16 22:23:54 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.30 2007/03/31 10:06:21 betelgeuse Exp $ + + 31 Mar 2007; Petteri Räty + -libgtk-java-2.8.3-r1.ebuild, -libgtk-java-2.8.7.ebuild: + Cleanup. 16 Feb 2007; Petteri Räty libgtk-java-2.8.7-r1.ebuild: @@ -129,14 +133,14 @@ New upstream release. Ebuild submitted by Andrew F. Cowie . Partial fix for #83366. -* libgtk-java-2.4.7.2 (27 Dec 2004) +*libgtk-java-2.4.7.2 (27 Dec 2004) 27 Dec 2004; Andrew Cowie +libgtk-java-2.4.7.2.ebuild: Upstream stable maintenance release. Note that 2.4.7 had a bug which prevented it from building, and that 2.4.7.1 had its internal version numbers wrong. -* libgtk-java-2.4.6-r2 (24 Dec 2004) +*libgtk-java-2.4.6-r2 (24 Dec 2004) 24 Dec 2004; Andrew Cowie +libgtk-java-2.4.6-r2.ebuild, -libgtk-java-2.4.6-r1.ebuild: @@ -147,7 +151,7 @@ added a patch to set JAVA_INCLUDES when not using gcj, so it can find jni.h & familiy, #72128 -* libgtk-java-2.4.6-r1 (15 Nov 2004) +*libgtk-java-2.4.6-r1 (15 Nov 2004) 15 Nov 2004; Andrew Cowie +libgtk-java-2.4.6-r1.ebuild: Dependency on docbook-sgml-utils discovered by karltk; investigation showed @@ -155,15 +159,6 @@ in the documentation. Fixed by patching the java-gnome autoconf macros to remove the path check for docbook2html. -* libgtk-java-2.4.6 (07 Nov 2004) - - 07 Nov 2004; Andrew Cowie : - New ebuild. What used to be java-gnome is now multiplexed into various modular - subcomponents. Upstream CVS was all re-arranged, and now there is a release - tarball for each piece. This ebuild is the java binding around the core GTK - libraries (and is the only one of the new pieces which doesn't need the rest of - GNOME installed). - 29 Nov 2004; Thomas Matthijs +files/libgtk-java-2.4.6_find_jni.patch, libgtk-java-2.4.6-r1.ebuild: added a patch to set JAVA_INCLUDES when not using gcj, so it can find jni.h @@ -180,8 +175,6 @@ Initial import into Portage. Ebuild and patches by Andrew Cowie . Fixes #70559. -*libgtk-java-2.4.6 (07 Nov 2004) - 07 Nov 2004; Andrew Cowie : New ebuild. What used to be java-gnome is now multiplexed into various modular subcomponents. Upstream CVS was all re-arranged, and now there is a release diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1 deleted file mode 100644 index 1de6db19a831..000000000000 --- a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0bcf838a3220fdfa685c55c22d664874 libgtk-java-2.8.3.tar.gz 1099065 -RMD160 f9179f032033d02a9a8a667a202111ed71f525a7 libgtk-java-2.8.3.tar.gz 1099065 -SHA256 cdc8a9c37b8b69a2e68d77b6aeaf0780ec9d277fc104c718f18a50f20982fe1c libgtk-java-2.8.3.tar.gz 1099065 diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.7 b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.7 deleted file mode 100644 index 581d85252467..000000000000 --- a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 58d20b3a104d322cf5f5a356184f04a3 libgtk-java-2.8.7.tar.gz 1122001 -RMD160 eb165c0312d6a2876da446451d6ff81112b275f6 libgtk-java-2.8.7.tar.gz 1122001 -SHA256 dd7c551969136c6938c8f22322cc4407682f3609ff9d2d7738a487061fcbca90 libgtk-java-2.8.7.tar.gz 1122001 diff --git a/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild deleted file mode 100644 index ddeb15e69083..000000000000 --- a/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild,v 1.6 2006/12/17 13:38:55 betelgeuse Exp $ - -# Must be before the gnome.org inherit -GNOME_TARBALL_SUFFIX="gz" - -inherit java-pkg eutils gnome.org - -DESCRIPTION="Java bindings for GTK+" -HOMEPAGE="http://java-gnome.sourceforge.net/" - -# Not on gnome.org mirrors yet :-( -SRC_URI="http://research.operationaldynamics.com/linux/java-gnome/dist/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="2.8" -KEYWORDS="amd64 ppc x86" -IUSE="doc gcj source" - -DEPS=" - >=x11-libs/gtk+-2.8.3 - >=dev-java/glib-java-0.2.3 - >=dev-java/cairo-java-1.0.2 - >=dev-libs/glib-2.6.0 - >=x11-libs/cairo-1.0.0-r2 - dev-util/pkgconfig" - -DEPEND=">=virtual/jdk-1.4 - >=sys-apps/sed-4 - source? ( app-arch/zip ) - ${DEPS}" -RDEPEND=">=virtual/jre-1.4 - ${DEPS}" - -JARNAME="gtk${SLOT}.jar" - -pkg_setup() { - if use gcj ; then - if ! built_with_use sys-devel/gcc gcj ; then - ewarn - ewarn "You must build gcc with the gcj support to build with gcj" - ewarn - ebeep 5 - die "No GCJ support found!" - fi - fi - java-pkg_pkg_setup -} - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/aclocal_voodoo.patch - - # Oh the joys of patching the autotools stuff - aclocal || die "aclocal failed" - libtoolize --force --copy || die "libtoolize failed" - autoconf || die "autoconf failed" - automake || die "automake failed" -} - -src_compile() { - # this gcj deal is a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=336149 - local myflags - use gcj || myflags="${myflags} --without-gcj-compile" - econf ${myflags} \ - $(use_with doc javadocs) \ - --with-jardir=/usr/share/${PN}-${SLOT}/lib \ - || die "configure failed" - - emake || die "compile failed" - - # Fix the broken pkgconfig file - sed -i \ - -e "s:classpath.*$:classpath=\${prefix}/share/${PN}-${SLOT}/lib/${JARNAME}:" \ - ${S}/gtk2-java.pc -} - -src_install() { - emake DESTDIR=${D} install || die "install failed" - - # Examples are documentation - use doc || rm -rf ${D}/usr/share/doc/${PF}/examples - - # Use the jars installed by make - # and build our own package.env file. - # NOTE: dojar puts the jar in the wrong place! (/usr/share/${PN}/lib) - cat <<-END > ${D}/usr/share/${PN}-${SLOT}/package.env -DESCRIPTION=${DESCRIPTION} -CLASSPATH=/usr/share/${PN}-${SLOT}/lib/${JARNAME} -END - - use source && java-pkg_dosrc ${S}/src/java/org -} diff --git a/dev-java/libgtk-java/libgtk-java-2.8.7.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.7.ebuild deleted file mode 100644 index 440de25b3edb..000000000000 --- a/dev-java/libgtk-java/libgtk-java-2.8.7.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.8.7.ebuild,v 1.1 2006/10/08 03:54:45 nichoj Exp $ - -inherit java-gnome - -DESCRIPTION="Java bindings for GTK+" - -SLOT="2.8" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPS=">=x11-libs/gtk+-2.8.3 - >=dev-java/glib-java-0.2.3 - >=dev-java/cairo-java-1.0.2 - >=dev-libs/glib-2.6.0 - >=x11-libs/cairo-1.0.0-r2" - -DEPEND="${DEPS}" -RDEPEND="${DEPS}" - -JAVA_GNOME_PC="gtk2-java.pc"