fixed cvs ebuild conformance with repoman and .desktop filesHEADmaster

svn path=/; revision=25

3 files changed, 163 insertions, 95 deletions

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 3711020..7cc2e54 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -3,10 +3,11 @@ AUX README.translucency 8910 RMD160 417b3416aef5ddd4b13672a2760d3736cac6f900 SHA
 AUX VerticalSeparatorMargins.patch 3456 RMD160 95e2134f8596b1e73b3f09a92e635c9bc585b26a SHA1 d569de32acea88597ad8c6614b30566690d60f88 SHA256 7b79ab675277e3532a394a4b5b6192a989aa93ec244d4612d3a0804c84f7d848
 AUX fvwm-2.5.23-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf
 AUX fvwm-menu-xlock-xlockmore-compat.diff 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
+AUX fvwm.desktop 5638 RMD160 d7a4100749ad03778f52361167cf4f8204b0ed83 SHA1 63484485b7746dbb00779d8debafbdae5a5c7c03 SHA256 d52d00dd9911d63f129229d4220727da083a468bb765c200b8ae9bcbb278f294
 DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 SHA1 8e0f0b1eb888f7fcc27a0dbcc32a5b0f2895df2b SHA256 212dafb5fbace4a72d7a2d2dd6df7445709bad6739162a72879e4a6e942d69fc
+DIST fvwm-2.5.26-patchset.tar.bz2 30025 RMD160 06db0bd562a92b999f24c0fac2dc19aaad879ba4 SHA1 b5f8bd1d36557587a446337e80b7f94324ca74eb SHA256 3c13c7b44b6025e5fa4de9183ec28858d7f922a406961eda1386d8cc3ab02386
 DIST fvwm-2.5.26.tar.bz2 2509177 RMD160 47be927e61ef5411b668baec0e9a00d5691b3784 SHA1 26d9054c0f148a397eeaa9939be9329fb002831f SHA256 84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d
-DIST fvwm-patchset-20070901-r2.tar.bz2 37255 RMD160 787fe6f49e497a225648dbdd30b0636d3416a5b0 SHA1 9d56b1f2703feb52987e6aeb22dc151bc0e10d67 SHA256 9342142d216ca5b89c161a9796a08c4effc1b3d8dd41090e3419b051fac639fa
 EBUILD fvwm-2.5.25-r1.ebuild 4855 RMD160 49d456348cc811ae932158745a6022a3bb2cce10 SHA1 65028de9f8e0fae45dfd2bc62669de0148ef1364 SHA256 01b6b117c82c64003e8304fb2dc4bbd9e6dce59c984e5a43e26135ac9b38d6f6
 EBUILD fvwm-2.5.25.ebuild 4302 RMD160 62659051a96557f70f75d488cfab3cfe67a0d81e SHA1 030bb71d97610417dbad250078d37487ca079c42 SHA256 e473c31ffbd365d79c44dd7168156c1d750fa6cb5bbf0bdc6f0f549a9f613b38
 EBUILD fvwm-2.5.26.ebuild 4731 RMD160 a8f88e1d0ce25eb06ef1f95caa73d983e8e85e51 SHA1 02bdb21a4b8e2d9699508caabb879b872e2000ee SHA256 c29bfaa231d42b1726eeee0e3d4dbb910a939c58fcf62f1606b00bb1bbedfd31
-EBUILD fvwm-9999.ebuild 6984 RMD160 a1357ac42e391886aa7fe5a0333afc28e49ced1e SHA1 939415d4da5e87fad7a2119988638262773e7404 SHA256 be46ac780b3c0b6c051942394b9912580c2e28fb67c9748685ba38678436f14d
+EBUILD fvwm-9999.ebuild 6522 RMD160 e56892413f7542ec8663776b4f7d3e43418df15f SHA1 33048c6d50a72af51a4d76486d0ced16679ed93b SHA256 b25ecadc9aa29f001ee3f460fc622a529e0aef576183e4dc6e48167107cc1bda
diff --git a/x11-wm/fvwm/files/fvwm.desktop b/x11-wm/fvwm/files/fvwm.desktop
new file mode 100644
index 0000000..1ec1ae2
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm.desktop
@@ -0,0 +1,58 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=fvwm
+TryExec=fvwm
+Name=FVWM
+Name[hi]=एफ़वीडबल्यूएम
+Comment=A powerful ICCCM-compliant multiple virtual desktop window manager
+Comment[af]='n Kragtige venster bestuurder met veelvuldige virtuele werkskerms. Voldoen aan ICCCM vereistes
+Comment[ar]=مدير نوافذ قوي ومتوافق مع ICCCM ذي أسطح مكتب وهمية متعددة
+Comment[bn]= একটি শক্তিশালী ICCCM-compliant উইণ্ডো ম্যানেজার, যাতে একাধিক ভার্চুয়াল ডেস্কটপ সম্ভব
+Comment[bs]=Moćan ICCCM-sukladan window manager sa podrškom za više virtuelnih desktopa
+Comment[ca]=Un poderós gestor de finestres per a múltiples escriptoris virtuals que compleix amb ICCCM
+Comment[cy]=Trefnydd ffenestri pwerus efo penbyrddau rhith lluosol, sy'n cydymffurfio â ICCCM
+Comment[da]=En kraftig ICCCM-kompliant vindueshåndtering med flere virtuelle desktoppe
+Comment[de]=Ein leistungsfähiger ICCCM-kompatibler Fenstermanager mit virtuellen Arbeitsflächen
+Comment[el]=Ένας πολύ δυνατός, συμβατός με το ICCCM, διαχειριστής παραθύρων με πολλαπλές εικονικές επιφάνειες εργασίας
+Comment[eo]=Fenestroadministrilo
+Comment[es]=Un potente administrador de ventanas, compatible con ICCCM y que soporta varios escritorios virtuales
+Comment[et]=Võimas ICCCM nõuetele vastav mitme virtuaalse töölauaga aknahaldur
+Comment[eu]=ICCCM konpatiblea den, eta mahaigain birtual ugari dituen leiho kudeatzaile bortitza
+Comment[fi]=Tehokas ICCCM-mukautuva virtuaalityöpöytiä tukeva ikkunaohjelma
+Comment[fr]=Un gestionnaire de fenêtres puissant compatible ICCCM avec gestion de bureaux virtuels multiples
+Comment[fy]=In krêftige ICCCM-compliant finstersmanager mei meardere buroblêden
+Comment[gl]=Un xestor de fiestras potente acorde coa ICCCM con múltiples escritorios virtuais
+Comment[he]=מנהל חלונות עצמתי עם תאימות ל־ICCCM בעל שולחנות עבודה וירטואליים רבים
+Comment[hi]=शक्तिशाली आईसीसीसीएम-कम्पलाएंट अनेक आभासी डेस्कटॉप विंडो प्रबंधक
+Comment[hr]=Moćni, ICCCM kompatibilni, upravitelj prozora s više virtualnih radnih površina
+Comment[hu]=Egy sokoldalú, ICCCM-kompatibilis ablakkezelő, virtuális munkaasztal-kezeléssel
+Comment[is]=Öflugur ICCCM samhæfður gluggastjóri með sýndarskjáborðum
+Comment[it]=Un window manager molto potente e ICCCM-compatibile che supporta i desktop virtuali
+Comment[ja]=複数の仮想デスクトップをサポートしたICCCM準拠のパワフルなウィンドウマネージャ
+Comment[lt]=galinga, su ICCCM suderinama daugelio virtualių darbastalių langų tvarkyklė
+Comment[mk]=Моќен менаџер на прозорци со повеќе виртуелни површини во согласност со ICCCM
+Comment[mt]=Window manager b'saħħtu, konformi ma' ICCCM, b'desktops virtwali.
+Comment[nb]=En slagkraftig vindusbehandler med flere virtuelle skrivbord, som støtter ICCCM
+Comment[nds]=En kraftvulle, ICCCM-kompatible Finsterpleger, mit vele virtuelle Schriefdischen
+Comment[nl]=Een krachtige ICCCM-compliant windowmanager met meerdere bureaubladen
+Comment[nn]=Ein slagkraftig vindaugssjef med fleire virtuelle skrivebord, som støttar ICCCM
+Comment[pa]=ਇੱਕ ਸ਼ਕਤੀਸ਼ਾਲੀ ICCCM-ਅਨੁਕੂਲ ਬਹੁ-ਫਰਜ਼ੀ ਵਿਹੜਿਆਂ ਵਾਲਾ ਝਰੋਖਾ ਪ੍ਰਬੰਧਕ
+Comment[pl]=Potężny menedżer okien zgodny z ICCCM obsługujący wirtualne pulpity
+Comment[pt]=Um gestor de janelas poderoso em conformidade com o ICCCM e que suporta vários ecrãs virtuais
+Comment[pt_BR]=Um poderoso gerenciador de janelas compatível com o ICCM, com suporte a múltiplas áreas de trabalho virtuais
+Comment[ro]=Un manager de ferestre puternic compliant ICCCM ce suportă ecrane virtuale
+Comment[ru]=Мощный ICCCM-совместимый оконный менеджер, поддерживающий виртуальные рабочие столы
+Comment[se]=Fápmolaš ICCCM-heivvolaš lásegieđahalli mas lea virtuealla čállinbeavddit
+Comment[sk]=Výkonný správca okien kompatibilný s ICCCM s podporou virtuálnych plôch
+Comment[sl]=Močan okenski upravitelj z večimi navideznimi namizji in popolnoma v skladu z ICCCM
+Comment[sr]=Моћни, ICCCM-сагласни, менаџер прозора са више виртуелних радних површина
+Comment[sr@Latn]=Moćni, ICCCM-saglasni, menadžer prozora sa više virtuelnih radnih površina
+Comment[sv]=Kraftfull fönsterhanterare med flera virtuella skrivbord som följer ICCCM
+Comment[ta]=ICCCM-தரத்தில் பலதரப்பட்ட மெய்நிகர் மேல் மேசை சாளர மேளாளர்
+Comment[tg]=Мудири равзанаи мутобиқи ICCCM, ки мизи кориҳои виртуалиро пуштибонӣ мекунад
+Comment[tr]=Güçlü ICCCM-uyumlu çoklu sanal masaüstü yöneticisi
+Comment[uk]=Потужний, сумісний з ICCCM менеджер вікон, з підтримкою віртуальних стільниць
+Comment[vi]=Trình quản lý cửa sổ ICCCM tương thích đa desktop ảo
+Comment[zh_CN]=强大的多虚拟桌面窗口管理器，与 ICCCM 兼容
+Comment[zh_TW]=一個強大的 ICCCM 相容的多重虛擬桌面視窗管理程式
diff --git a/x11-wm/fvwm/fvwm-9999.ebuild b/x11-wm/fvwm/fvwm-9999.ebuild
index aaf18bc..943352b 100644
--- a/x11-wm/fvwm/fvwm-9999.ebuild
+++ b/x11-wm/fvwm/fvwm-9999.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit autotools cvs eutils flag-o-matic
 
-PATCHSET="fvwm-patchset-20070901-r2.tar.bz2"
+PATCHSET="fvwm-2.5.26-patchset.tar.bz2"
 
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager - Live CVS version"
 HOMEPAGE="http://www.fvwm.org/"
 SRC_URI="http://jesgue.homelinux.org/fvwm-files/${PATCHSET}"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2 FVWM"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# extras use flag disabled until I can check the whole patchset again
-IUSE="bidi debug doc gtk imlib nls perl png readline rplay session shape svg stroke tk translucency truetype xinerama xpm"
+IUSE="bidi debug doc extras gtk gtk2-perl imlib netpbm nls perl png readline rplay session shape svg stroke tk translucency truetype xinerama xpm"
 
 ECVS_SERVER="cvs.fvwm.org:/home/cvs/fvwm"
 ECVS_MODULE="fvwm"
@@ -24,66 +22,90 @@ ECVS_PASS="guest"
 ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
 S="${WORKDIR}/${ECVS_MODULE}"
 
-RDEPEND="readline? ( sys-libs/readline sys-libs/ncurses )
-		gtk? ( =x11-libs/gtk+-1.2* imlib? ( media-libs/imlib ) )
-		rplay? ( media-sound/rplay )
-		bidi? ( dev-libs/fribidi )
-		png? ( media-libs/libpng )
-		svg? ( gnome-base/librsvg )
-		stroke? ( dev-libs/libstroke )
-		perl? ( tk? (
-					dev-lang/tk
-					dev-perl/perl-tk
-					>=dev-perl/X11-Protocol-0.56 ) )
-		truetype? ( virtual/xft media-libs/fontconfig )
-		userland_GNU? ( sys-apps/debianutils )
-		dev-lang/perl
-		sys-libs/zlib
-		x11-libs/libXpm
-		x11-libs/libXft
-		xinerama? ( x11-libs/libXinerama )
-		svg? ( gnome-base/librsvg )"
-# XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
-# XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
-# XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
+RDEPEND="dev-lang/perl
+	bidi? ( dev-libs/fribidi )
+	gtk2-perl? (
+		dev-perl/gtk2-perl
+	)
+	netpbm? ( media-libs/netpbm )
+	perl? ( tk? (
+			dev-lang/tk
+			dev-perl/perl-tk
+			>=dev-perl/X11-Protocol-0.56
+		)
+	)
+	rplay? ( media-sound/rplay )
+	userland_GNU? ( sys-apps/debianutils )"
+
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		x11-libs/libXrandr
-		x11-proto/xextproto
-		x11-proto/xproto
-		!x11-wm/fvwm
-		xinerama? ( x11-proto/xineramaproto )
-		dev-libs/libxslt"
+	dev-libs/libxslt
+	dev-libs/libxml2
+	dev-util/pkgconfig
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-proto/xextproto
+	x11-proto/xproto
+	doc? ( dev-libs/libxslt )
+	gtk? (
+		=x11-libs/gtk+-1.2*
+		imlib? ( media-libs/imlib )
+	)
+	png? ( media-libs/libpng )
+	readline? (
+		sys-libs/ncurses
+		sys-libs/readline
+	)
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		virtual/xft
+	)
+	xinerama? (
+		x11-proto/xineramaproto
+		x11-libs/libXinerama
+	)"
 
 src_unpack() {
 
 	cvs_src_unpack
-	cd ${WORKDIR}; unpack ${A}
+	cd "${WORKDIR}"; unpack ${A}
 
 	# Those patches have not effects until they're not used in the
 	# configuration
-	EPATCH_SOURCE="${WORKDIR}/patchset"
-	EPATCH_SUFFIX="patch"
-	EXTRAS="${WORKDIR}/patchset/extras"
-	EPATCH_FORCE="yes"
-
-	cd ${S}; epatch "${FILESDIR}/VerticalSeparatorMargins.patch"
-	cd ${S}; epatch "${FILESDIR}/04-FlatSeparators-r5.patch"
-# extras use flag disabled until I can check the whole patchset again
-#	if use extras; then
-#		cd ${S}; epatch ${EXTRAS}
-#	fi
+	#EPATCH_SOURCE="${WORKDIR}/patchset"
+	#EPATCH_SUFFIX="patch"
+	#EXTRAS="${WORKDIR}/patchset"
+	#EPATCH_FORCE="yes"
+
+	cd "${S}"; epatch "${FILESDIR}/VerticalSeparatorMargins.patch"
+
+	if use extras; then
+		cd "${S}"; epatch "${WORKDIR}/patchset"
+	fi
+
 	# this patch enables fast translucent menus in fvwm
 	# taken from: https://bugs.gentoo.org/show_bug.cgi?id=156240
 	if use translucency; then
-		cd ${S}; epatch ${EPATCH_SOURCE}/fvwm-translucent-menus.patch
+		cd "${S}"; epatch "${FILESDIR}/fvwm-2.5.23-translucent-menus.diff"
 	fi
 
 	# fixing #51287, the fvwm-menu-xlock script is not compatible
 	# with the xlockmore implementation in portage.
 	# This is now unconditional, since it is trivial and there is
 	# no sense in not applying it.
-	cd ${S}; epatch ${EPATCH_SOURCE}/fvwm-menu-xlock-xlockmore-compat.diff
+	cd "${S}"; epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff"
 
 	cd "${S}"; eautoreconf
 }
@@ -126,7 +148,7 @@ src_compile() {
 		append-flags -fsigned-char
 	fi
 
-	cd ${S}
+	cd "${S}"
 	econf ${myconf} \
 		`use_enable truetype xft` \
 		`use_with stroke stroke-library` \
@@ -149,65 +171,52 @@ src_compile() {
 }
 
 src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	emake DESTDIR=${D} install || die
+	# These are always removed, because gentoo doesn't have anymore
+	# a dev-perl/gtk-perl package, so, these modules are pointless.
+	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
+	find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
 
 	if use perl; then
-
-		local toolkits="gtk tcltk"
-
 		if ! use tk; then
-			# Remove the Tk bindings (requires perl-tk)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm
-			toolkits=${toolkits/tcltk/}
-		fi
-		if ! use gtk; then
-			# Remove gtk bindings (requires gtk-perl/gtk2-perl)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
-				${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-			toolkits=${toolkits/gtk/}
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
+			if ! use gtk2-perl; then # no tk and no gtk2 bindings
+				rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
+				find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
+			fi
 		fi
-		toolkits=${toolkits// /}
-		if ! test "${toolkits}"; then
-			# No perl toolkit bindings wanted, remove the unneeded files
-			# and empty directories.
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm
-			find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null
+
+		# Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl
+		# so it implies gtk2 as well. That's why we need another use flag.
+		if ! use gtk2-perl; then
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
 		fi
 	else
-		# Remove useless script if perllib isnt required.
-		rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1
+		# Compretely wipe it if ! use perl
+		rm -rf "${D}/usr/bin/fvwm-perllib" \
+			"${D}/usr/share/man/man1/fvwm-perllib.1"
 	fi
 
-	# neat utility for testing fvwm behaviour on applications setting various
-	# hints, creates a simple black window with configurable hints set.
+	# Utility for testing FVWM behaviour by creating a simple window with
+	# configurable hints.
 	if use debug; then
-		dobin ${S}/tests/hints/hints_test
-		newdoc ${S}/tests/hints/README README.hints
+		dobin "${S}/tests/hints/hints_test"
+		newdoc "${S}/tests/hints/README" README.hints
 	fi
 
-	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
-	# fvwm-convert-2.2 has a man page, but the script is no longer distributed.
-	rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1
-	rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1
-
-	# ive included `exec` to save a few bytes of memory.
-	echo "#!/bin/bash" > fvwm2
-	echo "exec /usr/bin/fvwm2" >> fvwm2
-
-	exeinto /etc/X11/Sessions
-	doexe fvwm2
+	# Remove fvwm-convert-2.6 as it does not contain any code.
+	rm -f "${D}/usr/bin/fvwm-convert-2.6" \
+		"${D}/usr/share/man/man1/fvwm-convert-2.6.1"
 
-	# desktop entry for gdm, kdm, ...
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/${PN}.desktop
+	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}"
 
-	dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \
-	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
-	docs/fvwm.lsm
+	dodoc AUTHORS ChangeLog NEWS README \
+		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
+		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
 
-	dodoc ${FILESDIR}/README.translucency
+	# README file for translucent menus patch.
+	use vanilla || dodoc "${FILESDIR}/README.translucency"
 }
 
 pkg_postinst() {