[gentoo-commits] gentoo-x86 commit in x11-themes/fvwm-themes: ChangeLog fvwm-themes-0.7.0.ebuild

[Kacper Kowalik (xarthisius)]

xarthisius    10/05/28 12:39:32

  Modified:             ChangeLog fvwm-themes-0.7.0.ebuild
  Log:
  QA cleaning, fixing bug 226397 and bug 314415
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.18                 x11-themes/fvwm-themes/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-themes/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-themes/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-themes/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	6 Jan 2008 08:57:22 -0000	1.17
+++ ChangeLog	28 May 2010 12:39:31 -0000	1.18
@@ -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 <xarthisius@g.o>
+  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 <omp@g.o>
   +files/fvwm-themes-0.7.0-gentoo1.patch, fvwm-themes-0.7.0.ebuild:



1.17                 x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild?r1=1.16&r2=1.17

Index: fvwm-themes-0.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fvwm-themes-0.7.0.ebuild	6 Jan 2008 08:57:22 -0000	1.16
+++ fvwm-themes-0.7.0.ebuild	28 May 2010 12:39:31 -0000	1.17
@@ -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 @@
 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}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-gentoo1.patch"
-	epatch "${FILESDIR}/${P}-posix-sort.patch"
+RDEPEND=">=x11-wm/fvwm-2.5.8"
+DEPEND="${RDEPEND}
+	gnome? ( || (
+		media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] )	)"
+
+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