Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 474474 - =x11-themes/fvwm-crystal-3.2.3 stabilization request
Summary: =x11-themes/fvwm-crystal-3.2.3 stabilization request
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Keywording and Stabilization (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Dominique Michel
URL:
Whiteboard: was: x11-themes/fvwm-crystal-3.0.6 - ...
Keywords: STABLEREQ
Depends on:
Blocks:
 
Reported: 2013-06-23 11:23 UTC by Dominique Michel
Modified: 2013-12-24 12:59 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
fvwm-crystal-3.0.6-r3.ebuild (fvwm-crystal-3.0.6-r3.ebuild,1.66 KB, text/plain)
2013-06-23 11:26 UTC, Dominique Michel
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Dominique Michel 2013-06-23 11:23:49 UTC
repoman output:


   x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r2.ebuild: please migrate from 'python' to 'python-r1 / python-single-r1 / python-any-r1' on line: 9

Reproducible: Always

Steps to Reproduce:
1. repoman
2.
3.
Actual Results:  
repoman is not happy

Expected Results:  
repoman to be happy

See bug468680
Comment 1 Dominique Michel 2013-06-23 11:26:04 UTC
Created attachment 351728 [details]
fvwm-crystal-3.0.6-r3.ebuild

Change EAPI to EAPI 5
Change python eclass to python-r1
Change URI to current URI
Comment 2 Jeroen Roovers (RETIRED) gentoo-dev 2013-06-23 14:05:27 UTC
Comment on attachment 351728 [details]
fvwm-crystal-3.0.6-r3.ebuild

--- fvwm-crystal-3.2.3.ebuild   2013-06-23 12:00:55.000000000 +0200
+++ -   2013-06-23 16:05:17.751678982 +0200
@@ -1,33 +1,40 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild,v 1.1 2013/06/23 10:00:55 hwoarang Exp $
+# $Header: $

-EAPI="5"
+EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+
 inherit eutils python-r1

-DESCRIPTION="Configurable and full featured FVWM theme, with lots of transparency and freedesktop compatible menu"
+DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency"
 HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://download.gna.org/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
-       >=x11-wm/fvwm-2.6.5[png]
-       || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-       || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
-       || ( x11-misc/hsetroot media-gfx/feh )
-       sys-apps/sed
-       sys-devel/bc
-       virtual/awk
-       x11-apps/xwd"
+       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
+       x11-apps/xwd
+       || ( x11-misc/habak x11-misc/hsetroot )
+       || ( x11-misc/stalonetray x11-misc/trayer )
+       >=x11-wm/fvwm-2.6.2[png]"
+
+src_prepare() {
+       find . -type d -name '.svn' -prune -exec rm -rf {} ';' || die
+       epatch \
+               "${FILESDIR}"/${PN}.apps.patch \
+               "${FILESDIR}"/${PN}-build.patch
+}
 
 src_install() {
        emake \ 
                DESTDIR="${D}" \
+               addondir="/usr/share/doc/${PF}/addons" \
                docdir="/usr/share/doc/${PF}" \
                prefix="/usr" \
                install
@@ -35,24 +42,22 @@
        python_replicate_script \
                "${D}/usr/bin/${PN}".{apps,wallpaper} \
                "${D}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
+
+       exeinto /etc/X11/Sessions
+       doexe "${FILESDIR}"/fvwm-crystal
+
+       insinto /usr/share/xsessions
+       doins addons/fvwm-crystal.desktop
 }
 
 pkg_postinst() {
        einfo
-       einfo "After installation, execute following commands:"
-       einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xresources ~/.Xresources"
-       einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xsession ~/.xinitrc"
+       einfo "Configuration examples can be found in ${ROOT}usr/share/doc/${PF}/examples/"
        einfo
        einfo "Many applications can extend functionality of fvwm-crystal."
-       einfo "They are listed in ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
-       einfo
-       einfo "Some icons fixes was committed recently."
-       einfo "To archive the same fixes on your private icon files,"
-       einfo "please read ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
-       einfo "This will fix the libpng warnings at stderr."
+       einfo "They are listed in the INSTALL file in ${ROOT}usr/share/doc/${PF}."
        einfo
-       einfo "The color themes was updated to Fvwm InfoStore."
-       einfo "To know how to update your custom color themes, please run"
-       einfo " ${ROOT}usr/share/${PN}/addons/convert_colorsets"
-       einfo ""
+       ewarn "In this release, all hyphens (-) in names of env variables"
+       ewarn "used by FVWM-Crystal have been replaced by underscores (_)."
+       ewarn "You may need to update your configuration."
 }
Comment 3 Jeroen Roovers (RETIRED) gentoo-dev 2013-07-23 12:49:21 UTC
Is it important to fix 3.0.6 when there is a 3.2.3 in the tree and a 3.2.5 waiting for bug #477828?
Comment 4 Tom Wijsman (TomWij) (RETIRED) gentoo-dev 2013-07-23 13:24:47 UTC
I think only the SRC_URI should be changed if and only if the tarball checksum or a checksum of its contents remain the same, to battle the SRC_URI from becoming 404 soon; which should be an acceptable change for a stable ebuild. The rest can be introduced as part of a new version, EAPI 5 and the python eclass migration ending up in stable are things that can wait one or more months. There isn't a deadline any time soon on the migration as far as I am aware. I suggest we can move the changes suggested here to the version bump and file this as a duplicate.
Comment 5 Dominique Michel 2013-07-23 17:49:46 UTC
(In reply to Jeroen Roovers from comment #3)
> Is it important to fix 3.0.6 when there is a 3.2.3 in the tree and a 3.2.5
> waiting for bug #477828?

No, 3.2.3 and 3.2.5 not only have new features, but are also easier and more comfortable to use. It would be best to stabilize 3.2.3, or even 3.2.5. The difference between 3.2.5 and 3.2.3 is much smaller than between 3.2.3 and 3.0.6.

I introduced a lot of changes in 3.2.0, including some hard to find bug fixes, other fixes and new bugs. With 3.2.3, the new functions begun to be mature, one of them have been fully rewritten. But 3.2.5 is better,, with very few new functions and with less bugs.

Ideally, I would suggest to replace 3.2.3 by 3.2.5. And in the long or middle run, to stabilize 3.2.5, and have it to replace 3.0.6.
Comment 6 Dominique Michel 2013-07-23 18:03:06 UTC
It is also bug #464364 that is related to fvwm-crystal-3.0.6. I dropped habak support in 3.1.7 in favour of feh. I am not enthusiastic to backport that change in 3.0.6. It work like it is, even if it issue that error at stderr.

When 3.0.6 is out of the tree, I would suggest to remove habak from the tree if no other package depend on it, and nobody fix it.
Comment 7 Sergey Popov gentoo-dev 2013-10-24 11:32:30 UTC
Turning this into stabilization request, cause it solves this bug

Arches, please test and mark stable =x11-themes/fvwm-crystal-3.2.3

Target keywords: amd64 x86
Comment 8 Chema Alonso Josa (RETIRED) gentoo-dev 2013-11-06 08:50:25 UTC
amd64 stable
Comment 9 Agostino Sarubbo gentoo-dev 2013-12-24 12:59:49 UTC
x86 stable. Closing.