From 3bed87003f05d902e6bdfd9bc8ddfb54d14bbf4c Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Sun, 30 Oct 2005 12:58:49 +0000 Subject: [PATCH] Fix libgnomeprint(ui) dependencies (bug #110865) Package-Manager: portage-2.0.53_rc6 --- app-office/abiword/ChangeLog | 7 ++- app-office/abiword/Manifest | 4 +- app-office/abiword/abiword-2.4.1.ebuild | 67 +++++++++++++------------ 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index 694f0b7adbe7..631b37256073 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/abiword # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.144 2005/10/30 02:25:13 joem Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.145 2005/10/30 12:58:49 leonardop Exp $ + + 30 Oct 2005; Leonardo Boshell abiword-2.4.1.ebuild: + Moved libgnomeprint(ui) dependencies since they are not optional (bug + #110865). Updated dependencies (zlib, libbonobo, glib, pango). Misc. + clean-ups. *abiword-2.4.1 (30 Oct 2005) diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index 0d9ccb926c5a..7d17dedd979b 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -1,7 +1,7 @@ -MD5 fbd840f200ec5c09dd19c32201cc0f84 ChangeLog 18888 +MD5 72fc3364e2d050fa19b63c8a136baaf8 ChangeLog 19127 MD5 aeb219db77df24fb0917fc9ce671ea47 abiword-2.2.10.ebuild 2333 MD5 a4690f5ba838c1e78ae01a71059c7715 abiword-2.2.11.ebuild 2350 -MD5 32ffb739df8ad1d18e111535ff459acf abiword-2.4.1.ebuild 2274 +MD5 2312cbc24cd08c002733e625ce8f8fc6 abiword-2.4.1.ebuild 2361 MD5 8b023d31957e4d3d1684959d96564364 files/digest-abiword-2.2.10 69 MD5 a8522f74aea43b8fe31b8075165da843 files/digest-abiword-2.2.11 69 MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-2.4.1 68 diff --git a/app-office/abiword/abiword-2.4.1.ebuild b/app-office/abiword/abiword-2.4.1.ebuild index 73481961c78f..d8ca7d6a4159 100644 --- a/app-office/abiword/abiword-2.4.1.ebuild +++ b/app-office/abiword/abiword-2.4.1.ebuild @@ -1,70 +1,72 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.1.ebuild,v 1.1 2005/10/30 02:25:13 joem Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.1.ebuild,v 1.2 2005/10/30 12:58:49 leonardop Exp $ inherit eutils fdo-mime alternatives -IUSE="gnome jpeg spell xml2 debug" - -S_P=${S}/${PN}-plugins S=${WORKDIR}/${P}/abi DESCRIPTION="Fully featured yet light and fast cross platform word processor" -HOMEPAGE="http://www.abisource.com" +HOMEPAGE="http://www.abisource.com/" SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gnome spell xml2" + LICENSE="GPL-2" SLOT="2" RDEPEND="virtual/x11 virtual/xft - >=media-libs/fontconfig-2.1 - media-libs/libpng + >=dev-libs/glib-2 >=x11-libs/gtk+-2.4 + >=x11-libs/pango-1.2 >=gnome-base/libglade-2 + >=gnome-base/libgnomeprint-2.2 + >=gnome-base/libgnomeprintui-2.2 + sys-libs/zlib + >=media-libs/libpng-1.2 + dev-libs/popt + >=media-libs/fontconfig-2.1 >=app-text/wv-1 >=dev-libs/fribidi-0.10.4 - dev-libs/popt xml2? ( >=dev-libs/libxml2-2.4.10 ) !xml2? ( dev-libs/expat ) spell? ( >=app-text/enchant-1.1 ) - gnome? ( >=gnome-base/libgnomeui-2.2 - >=gnome-base/libgnomeprint-2.2.1 - >=gnome-base/libgnomeprintui-2.2.1 + gnome? ( + >=gnome-base/libbonobo-2 + >=gnome-base/libgnomeui-2.2 >=gnome-extra/gucharmap-1.4 )" DEPEND="${RDEPEND} - dev-util/pkgconfig" + >=dev-util/pkgconfig-0.9" -src_compile() { - # this is a hack since I don't want to go hack in the gnome-vfs headerfiles. - # The issue is about gnome-vfs containing "long long" which makes gcc 3.3.1 balk - cp configure configure.old - cat configure.old |sed s:-pedantic::g >configure - rm -f configure.old - - econf \ - `use_enable gnome` \ - `use_enable gnome gucharmap` \ - `use_with xml2 libxml2` \ - `use_enable spell enchant` \ - `use_enable debug` \ - --enable-threads \ - --without-ImageMagick \ +src_compile() { + # this is a hack since I don't want to go hack in the gnome-vfs + # headerfiles. The issue is about gnome-vfs containing "long long" + # which makes gcc 3.3.1 balk + sed -i -e 's:-pedantic::g' configure + + local myconf="$(use_enable gnome) \ + $(use_enable gnome gucharmap) \ + $(use_enable spell enchant) \ + $(use_enable debug) \ + $(use_with xml2 libxml2) \ + --enable-threads \ --disable-scripting \ - --with-sys-wv || die + --with-sys-wv" + + econf $myconf || die "./configure failed" - emake all-recursive || die + emake all-recursive || die "Compilation failed" } src_install() { - dodir /usr/{bin,lib} - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die "Installation failed" dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop @@ -72,11 +74,10 @@ src_install() { rm -f ${D}/usr/bin/abiword dosym AbiWord-2.4 /usr/bin/abiword-2.4 - dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt + dodoc *.TXT docs/build/BUILD.TXT user/wp/readme.txt } pkg_postinst() { - fdo-mime_desktop_database_update alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]" -- 2.26.2