From: Joshua Nichols Date: Tue, 28 Mar 2006 04:10:13 +0000 (+0000) Subject: Revision bump to address bug #125646 and #121254 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ffd11ccd61d6230c44b003987f01ecad791af5d7;p=gentoo.git Revision bump to address bug #125646 and #121254 Package-Manager: portage-2.1_pre6-r6 --- diff --git a/dev-java/cairo-java/ChangeLog b/dev-java/cairo-java/ChangeLog index 288fa76c5eeb..4322a4f28071 100644 --- a/dev-java/cairo-java/ChangeLog +++ b/dev-java/cairo-java/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/cairo-java # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/ChangeLog,v 1.6 2006/01/11 01:43:12 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/ChangeLog,v 1.7 2006/03/28 04:10:13 nichoj Exp $ + +*cairo-java-1.0.2-r1 (28 Mar 2006) + + 28 Mar 2006; +cairo-java-1.0.2-r1.ebuild: + Revision bump to address bug #125646 and #121254 11 Jan 2006; Karl Trygve Kalleberg cairo-java-1.0.2.ebuild: diff --git a/dev-java/cairo-java/Manifest b/dev-java/cairo-java/Manifest index 5d3062cdf635..588033dcbf76 100644 --- a/dev-java/cairo-java/Manifest +++ b/dev-java/cairo-java/Manifest @@ -1,7 +1,27 @@ MD5 7857a9dc5c2445fae806859c1fe76d43 ChangeLog 1123 +RMD160 58cca6034c9631c66e4075ad998980b39118a5a0 ChangeLog 1123 +SHA256 9752d900570c7f0fabaa19fbd7bc289e1528b950d97ef528b60c01c2a4ec4e94 ChangeLog 1123 MD5 c306c9ae0a6dff619836b0306ee2786a cairo-java-1.0.1.ebuild 2005 +RMD160 7592df24c1264029bc5ddcedd456e18eed4a6b5a cairo-java-1.0.1.ebuild 2005 +SHA256 cf54d4ad2073c79178312cd64de515ca53049d7d41325c81ecd5c68cb2dc5c5b cairo-java-1.0.1.ebuild 2005 +MD5 1e77eee3703ee294ef617f16559f9f16 cairo-java-1.0.2-r1.ebuild 2011 +RMD160 f029699818b493fa3b64d279eeaa7b6f54d28916 cairo-java-1.0.2-r1.ebuild 2011 +SHA256 c21be6a26c8de0b9a346b798fb89d3b14d32b246f5ae3b506355bc833a9484a3 cairo-java-1.0.2-r1.ebuild 2011 MD5 87790236d6340212225c44608ae6d8f8 cairo-java-1.0.2.ebuild 1816 +RMD160 79980cb7cbb3055c6a3376da25b37be332b4aa6c cairo-java-1.0.2.ebuild 1816 +SHA256 71b1594fbd20c922d9ce1c791ee3a7e1f803c5e0f3e6f6b80ebbc4f75c164c67 cairo-java-1.0.2.ebuild 1816 MD5 f629db15b5df144efde17453c0c98c34 files/cairo_jni_includes.patch 841 +RMD160 c8873bf72f16c84d06e3ffaad9b10d06348fa4b9 files/cairo_jni_includes.patch 841 +SHA256 b54e8febb6c4849bf34721bb616209bb7375f38a91c55c751b0a98d45a91d115 files/cairo_jni_includes.patch 841 MD5 a74a4781b3ab4f8d361c0b71dd4fae6d files/digest-cairo-java-1.0.1 68 +RMD160 ea9adb90bc16c7e0424bfcd32b44d45f3ad5e99a files/digest-cairo-java-1.0.1 68 +SHA256 9901a331632a29bd862d2ef763e16b25611caa6291713a24325c6b958c2fd4dd files/digest-cairo-java-1.0.1 68 MD5 0a818004a4a930c29fa7ffd5a8f09024 files/digest-cairo-java-1.0.2 68 +RMD160 580c87bb01c557a91dcd3ed812a1333a73f9e417 files/digest-cairo-java-1.0.2 68 +SHA256 510b0256247803bc1a328632d430ca763d3e603d87c8ff06ea84b0bde5993af1 files/digest-cairo-java-1.0.2 68 +MD5 e46095df7c28a5ef5a9d576b920e0efb files/digest-cairo-java-1.0.2-r1 250 +RMD160 4bef909af657e2991ab82e85a9963d6839d7e912 files/digest-cairo-java-1.0.2-r1 250 +SHA256 92946772d4c2340ceaf80ed8aec26dc2f272de97893c97d673774e8a7645c5bd files/digest-cairo-java-1.0.2-r1 250 MD5 9fe190d25d088cdf4fd038710fd4ee93 metadata.xml 335 +RMD160 df96231324c72a35110e1d74cc7a3adb85c4cc2e metadata.xml 335 +SHA256 c595e561cac5567e54d4787a3b76fdac74a7c583bd51868d21f1e719134ccbd2 metadata.xml 335 diff --git a/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild b/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild new file mode 100644 index 000000000000..6a09cde4a26d --- /dev/null +++ b/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild,v 1.1 2006/03/28 04:10:13 nichoj Exp $ + +# Must be before the gnome.org inherit +GNOME_TARBALL_SUFFIX="gz" + +inherit java-pkg eutils gnome.org + +DESCRIPTION="Java bindings for cairo" +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="1.0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc gcj source" + +DEPS=">=x11-libs/cairo-1.0.0-r2 + >=dev-java/glib-java-0.2.2 + >=media-libs/fontconfig-2.3.1 + >=dev-libs/glib-2.6.0 + dev-util/pkgconfig" + +DEPEND=">=virtual/jdk-1.4 + >=sys-apps/sed-4 + source? ( app-arch/zip ) + ${DEPS}" +RDEPEND=">=virtual/jre-1.4 + ${DEPS}" + +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) \ + $(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/cairo${SLOT}.jar:" \ + ${S}/${PN}.pc +} + +src_install() { + emake DESTDIR=${D} install || die "install failed" + + # 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/cairo${SLOT}.jar +END + + use source && java-pkg_dosrc src/java/org +} diff --git a/dev-java/cairo-java/files/digest-cairo-java-1.0.2-r1 b/dev-java/cairo-java/files/digest-cairo-java-1.0.2-r1 new file mode 100644 index 000000000000..295620561e1b --- /dev/null +++ b/dev-java/cairo-java/files/digest-cairo-java-1.0.2-r1 @@ -0,0 +1,3 @@ +MD5 cc2c90fec19cdcafd177463e85595120 cairo-java-1.0.2.tar.gz 358083 +RMD160 800873dc7ec58d7d696ad972758bd345c5255a1a cairo-java-1.0.2.tar.gz 358083 +SHA256 408f9d6a1d1f7be6f6c50e7e9159c174d52a1aca1616d6ff3e2e677683067040 cairo-java-1.0.2.tar.gz 358083