[proaudio] [2723] fvwm-crystal-9999: removed non needed USE flags; updated to EAPI 5 and python-r1

[subversion@xxxxxxxxxxxxx]

Revision: 2723
Author:   dominique
Date:     2013-05-05 21:22:33 +0200 (Sun, 05 May 2013)
Log Message:
-----------
fvwm-crystal-9999: removed non needed USE flags; updated to EAPI 5 and python-r1

Modified Paths:
--------------
    trunk/overlays/proaudio/x11-themes/fvwm-crystal/ChangeLog
    trunk/overlays/proaudio/x11-themes/fvwm-crystal/Manifest
    trunk/overlays/proaudio/x11-themes/fvwm-crystal/fvwm-crystal-9999.ebuild
    trunk/overlays/proaudio/x11-themes/fvwm-crystal/metadata.xml

Modified: trunk/overlays/proaudio/x11-themes/fvwm-crystal/ChangeLog
===================================================================
--- trunk/overlays/proaudio/x11-themes/fvwm-crystal/ChangeLog	2013-05-05 15:21:13 UTC (rev 2722)
+++ trunk/overlays/proaudio/x11-themes/fvwm-crystal/ChangeLog	2013-05-05 19:22:33 UTC (rev 2723)
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 May 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx> fvwm-crystal-9999.ebuild:
+  updated to pyrhon-r1 eclass and EAPI 5. Removed non needed USE flags.
+  metadata.xml: removed non needed USE flag.
+
   25 Apr 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx> files/fvwm-crystal:
   fixed typo in Session file
   fvwm-crystal-9999.ebuild: removed the info about Gnome 2 session management;

Modified: trunk/overlays/proaudio/x11-themes/fvwm-crystal/Manifest
===================================================================
--- trunk/overlays/proaudio/x11-themes/fvwm-crystal/Manifest	2013-05-05 15:21:13 UTC (rev 2722)
+++ trunk/overlays/proaudio/x11-themes/fvwm-crystal/Manifest	2013-05-05 19:22:33 UTC (rev 2723)
@@ -1,3 +1,3 @@
-EBUILD fvwm-crystal-9999.ebuild 2674 SHA256 52809a58bcda26c07a9fe45039b188c5631699a75ec817da4e2a8ca09dd9b536 SHA512 6a8c3fa0ffa10192ed902ddbf46fc3348c59406812194dcd90d083a381991cb862afa9f10e416dc5640648ffefcf58223445cfd19d90910cfc2fd2bcaab4fc3d WHIRLPOOL ba98d8b7263ab4a1e78d5d9f8a2dacbf04e6735430f8d210f8524286ac03f95726c1d694f1da729290e57252ba66de22756aac120777ab88b4d3fed95a6f05db
-MISC ChangeLog 2255 SHA256 746bfd858691a14fea1e94f651172b321be8a0a80a829dce7b3e3227dcf8fedc SHA512 33194be3539df138077da5bfb04353d38b3b4619b1dc66c933e8bd6af7c2928583e1f2aaa7f2639311a7b429f08ba1a632638d9cfcb94bf730ad70b5e60cf106 WHIRLPOOL 67cd53a1f2b5bdbde18f62787da4d46ecc2dc49209c0fa7e99e12697925ca1c80a4873031f7345fd8606ffcec8a1c8d5ef5e900f856cb3a8dfd529f93e544498
-MISC metadata.xml 338 SHA256 7260b1014583b67f5483f503aef707e2da1d98e753bba98abb0bab4b2bdaf376 SHA512 7fa31cec8d1b5891f7675c787dcff08431365e9a9f8fc827213bde1038c6b53e4639ea9978e0328b4ddb4468c547d9791574f2dc2f7931fe7522c3e23d9756e0 WHIRLPOOL 73480249871220a3e7315ea4f4063a5ed77bf09cf36d53f4b5e9a834bdcec87ae514d3e9d5847c87b551e3cd1eaa6103756947f13532a0cc96bff601cdffef9b
+EBUILD fvwm-crystal-9999.ebuild 1742 SHA256 7af2f883af84e0a65bb2605fceabc71352494bf86152076464cf7165052b561a SHA512 3f4c243c9493c1e1d622c063a66711223b94cfc1169d4e2ae79b824b3939d852631fd37794ff7a674fa48dcf1ac4b197aad055a5833711c241e2126caf235112 WHIRLPOOL d54d2a3b25c8bd41f2865e76ac650a5ffe2893be8ea7df98346c96c37bcd3439739117836b079dabb3de6e548d7d72feb3979bd2b2261c634757bea46d84b691
+MISC ChangeLog 2471 SHA256 e4d4da42577b5d258813011158d29bb5e165c91c6708439296f8b23280347c54 SHA512 ef830b5a89dfcb02745a5a888742f97dcd40702f1892b77087b486b01424b139f7972fa4bd313340f62d31ba2cd12ee79a1bb0c7604b800bb996b510036bd548 WHIRLPOOL f87c49664e97b7125e167cb25ae0f71e0af9d203c48e35b9a1b3fef18f27f3a929bcbe2469a9d54e63565a19400e12a76bdb86446ef75b0e85b6c8fced85164b
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Modified: trunk/overlays/proaudio/x11-themes/fvwm-crystal/fvwm-crystal-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/x11-themes/fvwm-crystal/fvwm-crystal-9999.ebuild	2013-05-05 15:21:13 UTC (rev 2722)
+++ trunk/overlays/proaudio/x11-themes/fvwm-crystal/fvwm-crystal-9999.ebuild	2013-05-05 19:22:33 UTC (rev 2723)
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 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.0.4.ebuild,v 1.6 2007/02/04 19:20:09 beandog Exp $
+# $Header: $
 
-EAPI="2"
-inherit subversion eutils python
+EAPI="5"
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python2_7 )
+inherit subversion eutils python-r1
 
 DESCRIPTION="Configurable and full featured FVWM theme, with lots of transparency and freedesktop compatible menu"
 HOMEPAGE="http://fvwm-crystal.org/";
@@ -14,14 +14,12 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="laptop session"
+IUSE=""
 
 ESVN_REPO_URI="svn://svn.code.sf.net/p/fvwm-crystal/code"
 
-# Should work with fvwm-2.5.13, but like portage use the correct fvwm exec name
-# only from 2.5.26 and that I am using this version to develop fvwm-crystal, it
-# is best to use 2.5.26 as dependency.
-RDEPEND=">=x11-wm/fvwm-2.5.26[png]
+RDEPEND="${PYTHON_DEPS}
+	>=x11-wm/fvwm-2.5.26[png]
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
 	|| ( x11-misc/hsetroot media-gfx/feh )
@@ -38,27 +36,11 @@
 	subversion_src_unpack
 }
 
-src_compile() {
-	sed -i 's/correctpermissions correctpath/correctpermissions/' Makefile || die "sed Makefile failed"
-
-	if use session; then
-		sed -i 's/Exec=fvwm/#Exec=fvwm/' addons/fvwm-crystal.desktop || die "sed failed"
-		sed -i 's/#Exec=gnome/Exec=gnome/' addons/fvwm-crystal.desktop || die "sed failed"
-	fi
-	einfo "There is nothing to compile."
-}
-
 src_install() {
-	#I added this USE flag because such recipes cause problem with rt-sources
-	# when the appropriate support is not compiled into the kernel
-	if ! use laptop; then
-		rm -f fvwm/recipes/*ACPI
-	fi
-
-	emake DESTDIR="${D}" prefix="/usr" install || die install failed
-
-	dodoc AUTHORS README Export.README INSTALL NEWS ChangeLog doc/*
-	cp -r addons "${D}"/usr/share/doc/"${PF}"/
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		prefix="/usr" install
 }
 
 pkg_postinst() {
@@ -77,6 +59,6 @@
 	einfo
 	einfo "The color themes was updated to Fvwm InfoStore."
 	einfo "To know how to update your custom color themes, please run"
-	einfo "	/usr/share/doc/${PF}/addons/convert_colorsets"
+	einfo "	/usr/share/doc/${PN}/addons/convert_colorsets."
 	einfo ""
 }

Modified: trunk/overlays/proaudio/x11-themes/fvwm-crystal/metadata.xml
===================================================================
--- trunk/overlays/proaudio/x11-themes/fvwm-crystal/metadata.xml	2013-05-05 15:21:13 UTC (rev 2722)
+++ trunk/overlays/proaudio/x11-themes/fvwm-crystal/metadata.xml	2013-05-05 19:22:33 UTC (rev 2723)
@@ -5,7 +5,4 @@
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>
 	</maintainer>
-	<use>
-		<flag name="laptop">Add a recipe that support laptop battery survey</flag>
-	</use>
 </pkgmetadata>