Fixed installation of ChangeLog file (Bug #316497), fixed dependencies, added conditi...

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/x11-libs/libmatchbox/ChangeLog b/x11-libs/libmatchbox/ChangeLog
index cfb26a1369ca13312820bec9aa907a0dd10f3499..4d2b626f0c357f8d05bd9e86706718fac04f6418 100644 (file)
--- a/x11-libs/libmatchbox/ChangeLog
+++ b/x11-libs/libmatchbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libmatchbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.13 2010/03/09 14:57:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.14 2010/04/26 15:17:37 yvasilev Exp $
+
+  26 Apr 2010; Yuri Vasilevski <yvasilev@gentoo.org> libmatchbox-1.9.ebuild:
+  Fixed installation of ChangeLog file (Bug #316497), fixed dependencies,
+  added conditional dependency to dev-libs/check (needed for running tests).
 
   09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   libmatchbox-1.9.ebuild, +files/libmatchbox-1.9-libpng14.patch:

diff --git a/x11-libs/libmatchbox/Manifest b/x11-libs/libmatchbox/Manifest
index 090b196c0142a92fea75b05a27fdc462503ac70a..c563ffe822f43f39846cf9494121773832cdcadd 100644 (file)
--- a/x11-libs/libmatchbox/Manifest
+++ b/x11-libs/libmatchbox/Manifest
@@ -2,6 +2,6 @@ AUX libmatchbox-1.9-libpng14.patch 347 RMD160 dc588e79e0dc98171931c633331f7b8e16
 DIST libmatchbox-1.8.tar.bz2 303304 RMD160 420158db32bd1b5968645b12faa9f333bee9e61e SHA1 e0422b2e3722134334bd80b4e3e064507459e8bc SHA256 a675f7b5b10dabf4d2951b629dd8d638219ec91078acd497aac4fcf2008a1c5b
 DIST libmatchbox-1.9.tar.bz2 316575 RMD160 5c72d1a86de1d6b4ffbe07b6a80ac705d2633fb3 SHA1 7820b2723581c20db92d8a36e1a75d4a0c57579a SHA256 db01e218e8d09540459c8f7c5698c159cd84c3d5b8caa9763bf0e5a35f6edf00
 EBUILD libmatchbox-1.8.ebuild 1534 RMD160 e9789adddb1b9a5732a04ee28cd41ad86eefdd01 SHA1 f4bf8dad9a92ebfa8f9261f3447600637e348acf SHA256 e44a516a0a5f6153146a47bdfcef6ff17f260af0297c56d4950707ad1992b032
-EBUILD libmatchbox-1.9.ebuild 1591 RMD160 a938575535056287c3deb49d331ef9207ee79c09 SHA1 b3c82dde483da9a9501ce110863d176ed2fa991a SHA256 4733dccddaabe26614d69a40b4b813e117275911da7865edf4064bc484a326aa
-MISC ChangeLog 1966 RMD160 505cb6a22e9d4bcbe7e0b432e2188e7ee8818c13 SHA1 caaaf3c0119ec536edee5e66a0d498b500cc734d SHA256 d2b96e01b915ecf3bc37ad791cfe87ca29515010398323680dac4a85209fe540
+EBUILD libmatchbox-1.9.ebuild 1660 RMD160 a9e5437c47da7f28d3c72b101a2e8ee7a5463416 SHA1 9e3365069aff2e5239e7070e8c8abbf5ea929c82 SHA256 7bb4faa43118f8a46585ef8071f8de85532bbf48ddbbabce5fa366410f1bb962
+MISC ChangeLog 2194 RMD160 3c6f0b8ea83e0023e5ef04a67d3ca2437ff42c36 SHA1 e38ea8bccb493f20a868a493adb87613e04e63f9 SHA256 85d1efba8543082f64dc023ceb9143c86c77317ce5bdd7388ab6265980d6c286
 MISC metadata.xml 413 RMD160 f5e5747505deb75f2af51d8f2c9ce571ddfa497e SHA1 7a9593a01566b4010552683107f4bb551903c220 SHA256 59b98562a4c53d3933bd84631651f38b7b9a1b761ab03b9e0e6a15fe058a7f51

diff --git a/x11-libs/libmatchbox/libmatchbox-1.9.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
index f6d40dc9f7390143fe3bd2a5eda9956e6e929924..fc8ea62c8f0d090468ab2631c1a83733a2588e7a 100644 (file)
--- a/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9.ebuild,v 1.8 2010/03/09 14:57:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9.ebuild,v 1.9 2010/04/26 15:17:37 yvasilev Exp $
 
-inherit eutils libtool
+inherit eutils
 
 DESCRIPTION="The Matchbox Library."
 HOMEPAGE="http://matchbox-project.org/"
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
-IUSE="debug doc jpeg pango png truetype X xsettings"
+IUSE="debug doc jpeg pango png test truetype X xsettings"
 
 RDEPEND="x11-libs/libXext
        truetype? ( x11-libs/libXft )
@@ -20,7 +20,9 @@ RDEPEND="x11-libs/libXext
        png? ( media-libs/libpng )
        xsettings? ( x11-libs/libxsettings-client )"
 
-DEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )
+       test? ( dev-libs/check )"
 
 pkg_setup() {
        # Bug #138135
@@ -36,6 +38,7 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
+
        epatch "${FILESDIR}"/${P}-libpng14.patch
        elibtoolize
 }
@@ -49,6 +52,7 @@ src_compile() {
                $(use_enable png) \
                $(use_enable xsettings) \
                $(use_with X x) \
+               $(use_enable test unit-tests) \
                || die "Configuration failed"
 
        emake || die "Compilation failed"
@@ -57,6 +61,6 @@ src_compile() {
 src_install() {
        make DESTDIR="${D}" install || die "Installation failed"
 
-       dodoc AUTHORS Changelog INSTALL NEWS README
+       dodoc AUTHORS ChangeLog INSTALL NEWS README
        use doc && dohtml doc/html/*
 }