1 |
ssuominen 09/08/03 10:17:16 |
2 |
|
3 |
Modified: fvwm-2.5.18-r1.ebuild |
4 |
Removed: fvwm-2.5.19.ebuild fvwm-2.5.21.ebuild |
5 |
Log: |
6 |
Some 50 repoman issues. |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.16 x11-wm/fvwm/fvwm-2.5.18-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild?rev=1.16&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild?rev=1.16&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild?r1=1.15&r2=1.16 |
15 |
|
16 |
Index: fvwm-2.5.18-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild,v |
19 |
retrieving revision 1.15 |
20 |
retrieving revision 1.16 |
21 |
diff -u -r1.15 -r1.16 |
22 |
--- fvwm-2.5.18-r1.ebuild 9 Jan 2009 15:06:36 -0000 1.15 |
23 |
+++ fvwm-2.5.18-r1.ebuild 3 Aug 2009 10:17:16 -0000 1.16 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2009 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild,v 1.15 2009/01/09 15:06:36 remi Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild,v 1.16 2009/08/03 10:17:16 ssuominen Exp $ |
29 |
|
30 |
inherit eutils flag-o-matic |
31 |
|
32 |
@@ -41,20 +41,22 @@ |
33 |
xinerama? ( x11-proto/xineramaproto )" |
34 |
|
35 |
src_unpack() { |
36 |
- unpack ${A}; export EPATCH_OPTS="-F3 -l" |
37 |
+ unpack ${A} |
38 |
+ cd "${S}" |
39 |
+ export EPATCH_OPTS="-F3 -l" |
40 |
|
41 |
# this patch enables fast translucent menus in fvwm. this is a |
42 |
# minor tweak of a patch posted to fvwm-user mailing list by Olivier |
43 |
# Chapuis in <20030827135125.GA6370@××××××.folie>. |
44 |
- cd ${S}; epatch ${WORKDIR}/fvwm-2.5.18-translucent-menus.diff |
45 |
+ epatch "${WORKDIR}"/fvwm-2.5.18-translucent-menus.diff |
46 |
|
47 |
# fixing #51287, the fvwm-menu-xlock script is not compatible |
48 |
# with the xlockmore implementation in portage. |
49 |
- cd ${S}; epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff |
50 |
+ epatch "${FILESDIR}"/fvwm-menu-xlock-xlockmore-compat.diff |
51 |
|
52 |
# fix security issue in fvwm-menu-directory when parsing directories |
53 |
# with newlines. |
54 |
- cd ${S}; epatch ${FILESDIR}/fvwm-menu-directory-security.diff |
55 |
+ epatch "${FILESDIR}"/fvwm-menu-directory-security.diff |
56 |
} |
57 |
|
58 |
src_compile() { |
59 |
@@ -98,7 +100,7 @@ |
60 |
} |
61 |
|
62 |
src_install() { |
63 |
- make DESTDIR=${D} install || die |
64 |
+ emake DESTDIR="${D}" install || die |
65 |
|
66 |
if use perl; then |
67 |
|
68 |
@@ -106,38 +108,38 @@ |
69 |
|
70 |
if ! use tk; then |
71 |
# Remove the Tk bindings (requires perl-tk) |
72 |
- rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm |
73 |
+ rm -f "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm |
74 |
toolkits=${toolkits/tcltk/} |
75 |
fi |
76 |
if ! use gtk; then |
77 |
# Remove gtk bindings (requires gtk-perl/gtk2-perl) |
78 |
- rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \ |
79 |
- ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm |
80 |
+ rm -f "${D}"/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \ |
81 |
+ "${D}"/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm |
82 |
toolkits=${toolkits/gtk/} |
83 |
fi |
84 |
toolkits=${toolkits// /} |
85 |
if ! test "${toolkits}"; then |
86 |
# No perl toolkit bindings wanted, remove the unneeded files |
87 |
# and empty directories. |
88 |
- rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm |
89 |
- find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null |
90 |
+ rm -f "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm |
91 |
+ find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null |
92 |
fi |
93 |
else |
94 |
# Remove useless script if perllib isnt required. |
95 |
- rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1 |
96 |
+ rm -rf "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1 |
97 |
fi |
98 |
|
99 |
# neat utility for testing fvwm behaviour on applications setting various |
100 |
# hints, creates a simple black window with configurable hints set. |
101 |
if use debug; then |
102 |
- dobin ${S}/tests/hints/hints_test |
103 |
- newdoc ${S}/tests/hints/README README.hints |
104 |
+ dobin "${S}"/tests/hints/hints_test |
105 |
+ newdoc "${S}"/tests/hints/README README.hints |
106 |
fi |
107 |
|
108 |
# fvwm-convert-2.6 is just a stub, contains no code - remove it for now. |
109 |
# fvwm-convert-2.2 has a man page, but the script is no longer distributed. |
110 |
- rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1 |
111 |
- rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1 |
112 |
+ rm -f "${D}"/usr/bin/fvwm-convert-2.6 "${D}"/usr/share/man/man1/fvwm-convert-2.6.1 |
113 |
+ rm -f "${D}"/usr/share/man/man1/fvwm-convert-2.2.1 |
114 |
|
115 |
# ive included `exec` to save a few bytes of memory. |
116 |
echo "#!/bin/bash" > fvwm2 |
117 |
@@ -148,11 +150,11 @@ |
118 |
|
119 |
wm=fvwm2 make_session_desktop FVWM fvwm2 |
120 |
|
121 |
- dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \ |
122 |
+ dodoc AUTHORS ChangeLog README NEWS docs/ANNOUNCE docs/BUGS \ |
123 |
docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \ |
124 |
docs/fvwm.lsm |
125 |
|
126 |
- dodoc ${FILESDIR}/README.transluceny |
127 |
+ dodoc "${FILESDIR}"/README.transluceny |
128 |
} |
129 |
|
130 |
pkg_postinst() { |