From 6d2132852f8d2296b9e9007ac4e8a9d739cebf6b Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 18 Aug 2005 17:13:00 +0000 Subject: Added support for glitz back to Cairo (Portage version: 2.0.51.22-r2) --- x11-libs/cairo/ChangeLog | 8 +++- x11-libs/cairo/Manifest | 18 ++++----- x11-libs/cairo/cairo-0.9.2-r1.ebuild | 59 +++++++++++++++++++++++++++++ x11-libs/cairo/cairo-0.9.2.ebuild | 61 ------------------------------ x11-libs/cairo/files/digest-cairo-0.9.2 | 1 - x11-libs/cairo/files/digest-cairo-0.9.2-r1 | 1 + 6 files changed, 76 insertions(+), 72 deletions(-) create mode 100644 x11-libs/cairo/cairo-0.9.2-r1.ebuild delete mode 100644 x11-libs/cairo/cairo-0.9.2.ebuild delete mode 100644 x11-libs/cairo/files/digest-cairo-0.9.2 create mode 100644 x11-libs/cairo/files/digest-cairo-0.9.2-r1 (limited to 'x11-libs/cairo') diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index 938e23835bd8..87577de422fc 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/cairo # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.40 2005/08/15 18:42:04 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.41 2005/08/18 17:13:00 cardoe Exp $ + +*cairo-0.9.2-r1 (18 Aug 2005) + + 18 Aug 2005; Doug Goldstein -cairo-0.9.2.ebuild, + +cairo-0.9.2-r1.ebuild: + Added glitz support back to the Cairo 0.9.x branch *cairo-0.9.2 (15 Aug 2005) diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index b4375c15e717..816028f328fa 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,18 +1,18 @@ -MD5 3ee59cecb2af1370a959e840350171be ChangeLog 5711 +MD5 c9d62438d9beba4c4e4ee2af62d87cdc ChangeLog 5893 MD5 3a4cce771cdc4714c6931467622c9ddc cairo-0.1.23-r1.ebuild 757 -MD5 40478a88cab74b07e5571294f629c237 cairo-0.9.2.ebuild 1567 MD5 4db2c222787dd6470523acdfe996891e cairo-0.2.0-r1.ebuild 900 -MD5 627da87d1d67830749f3dafde81804ca cairo-0.3.0.ebuild 843 -MD5 ea284a6e24864155e0176859cbddf1b3 metadata.xml 335 +MD5 00422caa1b2da7d6488fa5d4e5f82a6e cairo-0.9.2-r1.ebuild 1536 MD5 bf58c44a3e6266ea9d01e8788eabbccc cairo-0.3.0-r2.ebuild 997 +MD5 627da87d1d67830749f3dafde81804ca cairo-0.3.0.ebuild 843 MD5 1d2ad415e2e6db1a58640bb93b15a34f cairo-0.4.0.ebuild 994 -MD5 bc9e5e0986980a06b8ce6393b5e84cab files/digest-cairo-0.9.2 64 -MD5 39dcb140b758b53ecaceda25055f2b9d files/cairo-0.9.2-vendor_string.patch 665 +MD5 ea284a6e24864155e0176859cbddf1b3 metadata.xml 335 +MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697 +MD5 1ecec7f667ad4b91d876db0efdf4a261 files/cairo-0.4.0-makefile.patch 1553 +MD5 bc9e5e0986980a06b8ce6393b5e84cab files/digest-cairo-0.9.2-r1 64 MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64 MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0-r1 63 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0 63 -MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151 -MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697 -MD5 1ecec7f667ad4b91d876db0efdf4a261 files/cairo-0.4.0-makefile.patch 1553 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r2 63 MD5 f84da26023eb9d5a29079fbccc555523 files/digest-cairo-0.4.0 63 +MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151 +MD5 39dcb140b758b53ecaceda25055f2b9d files/cairo-0.9.2-vendor_string.patch 665 diff --git a/x11-libs/cairo/cairo-0.9.2-r1.ebuild b/x11-libs/cairo/cairo-0.9.2-r1.ebuild new file mode 100644 index 000000000000..05c960b443bf --- /dev/null +++ b/x11-libs/cairo/cairo-0.9.2-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.9.2-r1.ebuild,v 1.1 2005/08/18 17:13:00 cardoe Exp $ + +inherit eutils + +DESCRIPTION="A vector graphics library with cross-device output support" +HOMEPAGE="http://cairographics.org/" +SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz" + +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc glitz png static X" + +RDEPEND="X? ( ||( ( + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXt ) + virtual/x11 ) + virtual/xft ) + media-libs/fontconfig + >=media-libs/freetype-2.1 + sys-libs/zlib + glitz? ( =media-libs/glitz-0.4.4 ) + png? ( media-libs/libpng ) + !. For more details + # about the problem it fixes, see --GNOME bug-- #306216. + epatch ${FILESDIR}/${P}-vendor_string.patch +} + +src_compile() { + local myconf="$(use_enable X xlib) $(use_enable png) \ + $(use_enable static) $(use_enable doc gtk-doc) \ + $(use_enable glitz)" + + econf $myconf || die "./configure failed" + emake || die "Compilation failed" +} + + +src_install() { + make DESTDIR="${D}" install || die "Installation failed" + + dodoc AUTHORS ChangeLog NEWS README TODO +} diff --git a/x11-libs/cairo/cairo-0.9.2.ebuild b/x11-libs/cairo/cairo-0.9.2.ebuild deleted file mode 100644 index 5717654b1226..000000000000 --- a/x11-libs/cairo/cairo-0.9.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.9.2.ebuild,v 1.1 2005/08/15 18:42:04 leonardop Exp $ - -inherit eutils - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="http://cairographics.org/" -SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc png static X" -# glitz - -RDEPEND="X? ( - virtual/x11 - virtual/xft ) - media-libs/fontconfig - >=media-libs/freetype-2.1 - sys-libs/zlib - png? ( media-libs/libpng ) - !=media-libs/glitz-0.4.4 ) - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - doc? ( - >=dev-util/gtk-doc-1.3 - ~app-text/docbook-xml-dtd-4.2 )" - - -src_unpack() { - unpack ${A} - cd ${S} - - # Recognize gentoo's X server. See - # . For more details - # about the problem it fixes, see --GNOME bug-- #306216. - epatch ${FILESDIR}/${P}-vendor_string.patch -} - -src_compile() { - local myconf="$(use_enable X xlib) $(use_enable png) \ - $(use_enable static) $(use_enable doc gtk-doc)" - # $(use_enable glitz) - - econf $myconf || die "./configure failed" - emake || die "Compilation failed" -} - - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/x11-libs/cairo/files/digest-cairo-0.9.2 b/x11-libs/cairo/files/digest-cairo-0.9.2 deleted file mode 100644 index 0463cdceb65c..000000000000 --- a/x11-libs/cairo/files/digest-cairo-0.9.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 992095a5db597384a89b41e93737105d cairo-0.9.2.tar.gz 1346039 diff --git a/x11-libs/cairo/files/digest-cairo-0.9.2-r1 b/x11-libs/cairo/files/digest-cairo-0.9.2-r1 new file mode 100644 index 000000000000..0463cdceb65c --- /dev/null +++ b/x11-libs/cairo/files/digest-cairo-0.9.2-r1 @@ -0,0 +1 @@ +MD5 992095a5db597384a89b41e93737105d cairo-0.9.2.tar.gz 1346039 -- cgit v1.2.3-65-gdbad