From 622eba12357bfe9be3e3f3343325053043385499 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Fri, 28 May 2010 12:39:31 +0000 Subject: [PATCH] QA cleaning, fixing bug 226397 and bug 314415 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-themes/fvwm-themes/ChangeLog | 13 +++++- x11-themes/fvwm-themes/Manifest | 6 +-- .../files/fvwm-themes-0.7.0-posix-sort.patch | 11 ----- .../fvwm-themes/fvwm-themes-0.7.0.ebuild | 44 ++++++++----------- 4 files changed, 32 insertions(+), 42 deletions(-) diff --git a/x11-themes/fvwm-themes/ChangeLog b/x11-themes/fvwm-themes/ChangeLog index cd28cdd7fb8d..c6d7955caa11 100644 --- a/x11-themes/fvwm-themes/ChangeLog +++ b/x11-themes/fvwm-themes/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-themes/fvwm-themes -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.17 2008/01/06 08:57:22 omp Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.18 2010/05/28 12:39:31 xarthisius Exp $ + + 28 May 2010; Kacper Kowalik + fvwm-themes-0.7.0.ebuild, files/fvwm-themes-0.7.0-posix-sort.patch: + Fixing autotools rebuilt through maintainer-mode wrt bug 226397, thanks to + Diego for report. + Fixing dependency on media-gfx/{image,graphics}magick wrt bug 314415, + thanks to + Wojciech Porczyk for report. + Simplifying configure phase, skipping useless einfo, don't copy INSTALL 06 Jan 2008; David Shakaryan +files/fvwm-themes-0.7.0-gentoo1.patch, fvwm-themes-0.7.0.ebuild: diff --git a/x11-themes/fvwm-themes/Manifest b/x11-themes/fvwm-themes/Manifest index 143e45cb67e6..7adda44fa56e 100644 --- a/x11-themes/fvwm-themes/Manifest +++ b/x11-themes/fvwm-themes/Manifest @@ -1,7 +1,7 @@ AUX fvwm-themes-0.7.0-gentoo.patch 903 RMD160 0be80245fb91d24ea9e7307480e40eb3ec07c028 SHA1 ed26dd33428f0909073a6cd08f55ffcb653bcd6e SHA256 d9e6facd31d9d84fc668a90dabd0c9801e3ca04f09e441f6090362857c41a9d9 AUX fvwm-themes-0.7.0-gentoo1.patch 958 RMD160 79283cb232e67d7184a520a0dadccb03dbf478e3 SHA1 4abdce6075a6cc4a8ce67846c85befbb4c02ff28 SHA256 7f82418401d15a9ebfc62b681cedc47a894317a623579d345dadbe7f773ea0bb -AUX fvwm-themes-0.7.0-posix-sort.patch 772 RMD160 4f18bf0ef0d0b3d3a6ee1a8913d25ed923dec58a SHA1 1c759c7a86e469b324bd5457e9c001d3c6a4c27a SHA256 5839e87c9f2faa2ebe3712824c55106f6c333039fff8dbd575e7639c3c7e7468 +AUX fvwm-themes-0.7.0-posix-sort.patch 388 RMD160 baf22066a1d0f8956a850f5b3598809925d8e587 SHA1 f64554a36a531171813a23dca2b738918213bf4c SHA256 7b588615c1fb612f9e4b28068f4775515fa3b14bc4db3952ba1c992b13845f3e DIST fvwm-themes-0.7.0.tar.bz2 921517 RMD160 787147a95cfeb247ee511b6e2a3c5325839bf3e8 SHA1 e6c1fb5f776d4a03e05facfc1bc06f211bfac605 SHA256 0854ab07c2d765a499e6bbb2fd0b2722bc824c5b4fe6d9f917d71042919b5848 -EBUILD fvwm-themes-0.7.0.ebuild 1211 RMD160 e75ed40dbe9420ce2c6a69471721647ed13bf8c8 SHA1 ea6d8dc17e580eae47dd2c85d1cd2eb8cf5f29be SHA256 25ab7784a75c013fad569970b051bcefbe6aff4008682721bbe6e405e895e34f -MISC ChangeLog 2184 RMD160 82b52d636d04c1a65cbb64a5f7fb20beb6ebf928 SHA1 a20c9a03b74eec02ca8f33795bdd74ebad2907a5 SHA256 47171cf60b8a78155c0db45c15d1ed53863a62557ab19039470aec764d74b1a4 +EBUILD fvwm-themes-0.7.0.ebuild 1102 RMD160 d31fb91f844583995aaf4214adc0c34c90838ffb SHA1 527d47fc76fb88f12542717e6ae260c304330fd3 SHA256 945401fbe3c82434134bd531681bd5c0b91db3ddb9c898adb650f33cddcd2f88 +MISC ChangeLog 2602 RMD160 e473b5ec44b52452b2f3dcde89b8486cfb62ad8b SHA1 67d8a466d2ed316f94d32d943840f5138e3e52af SHA256 fc4843ecfb0e0b66c6d3ed9dd4a23e8f75fc2a96b5b6f8a124747b5875977171 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797 diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch index 8d2bb1fc4524..3974f95c5c51 100644 --- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch +++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch @@ -9,14 +9,3 @@ : # fvwm version is ok else ---- fvwm-themes-0.7.0/configure -+++ fvwm-themes-0.7.0/configure -@@ -4863,7 +4863,7 @@ - - # Hopefully this "sort" is portable (after many tries using awk and expr) - if (echo $REQUIRED_FVWM_VERSION; echo $FVWM_VERSION) \ --| sed 's/\./ /g' | uniq | sort -n +0 -1 +1 -2 +2 -3 -c 2>/dev/null; then -+| sort -c -n -t . -k 1,1 -k 2,2 -k 3,3 2>/dev/null; then - : - # fvwm version is ok - else diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild index a8d0b9b4b7e4..80a2aaf7ab5c 100644 --- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild +++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.16 2008/01/06 08:57:22 omp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.17 2010/05/28 12:39:31 xarthisius Exp $ -inherit eutils +EAPI="2" + +inherit autotools eutils DESCRIPTION="A configuration framework for the fvwm window manager" HOMEPAGE="http://fvwm-themes.sourceforge.net/" @@ -13,38 +15,28 @@ SLOT="0" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" IUSE="gnome" -DEPEND=">=x11-wm/fvwm-2.5.8 - gnome? ( media-gfx/imagemagick )" -RDEPEND="x11-wm/fvwm" - -src_unpack() { - unpack ${A} - cd "${S}" +RDEPEND=">=x11-wm/fvwm-2.5.8" +DEPEND="${RDEPEND} + gnome? ( || ( + media-gfx/imagemagick + media-gfx/graphicsmagick[imagemagick] ) )" - epatch "${FILESDIR}/${P}-gentoo.patch" - epatch "${FILESDIR}/${P}-gentoo1.patch" - epatch "${FILESDIR}/${P}-posix-sort.patch" +src_prepare() { + epatch "${FILESDIR}/${P}-gentoo.patch" \ + "${FILESDIR}/${P}-posix-sort.patch" + eautoreconf } -src_compile() { - local myconf - - use gnome && myconf="--enable-gnome-icons" - - econf ${myconf} || die "econf failed" - emake || die "emake failed" +src_configure() { + econf $(use_enable gnome gnome-icons) } src_install () { - make DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog INSTALL NEWS README TODO + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS README TODO || die } pkg_postinst() { - einfo - einfo "Configuring ${P}" - einfo - fvwm-themes-config --site --reset fvwm-themes-menuapp --site --build-menus --remove-popup -- 2.26.2