Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/afterstep: afterstep-2.2.4.ebuild
Date: Mon, 03 Aug 2009 10:39:26
Message-Id: E1MXuwt-0008PJ-OX@stork.gentoo.org
1 ssuominen 09/08/03 10:39:23
2
3 Modified: afterstep-2.2.4.ebuild
4 Log:
5 Quoting
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.15 x11-wm/afterstep/afterstep-2.2.4.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild?rev=1.15&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild?rev=1.15&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild?r1=1.14&r2=1.15
14
15 Index: afterstep-2.2.4.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v
18 retrieving revision 1.14
19 retrieving revision 1.15
20 diff -u -r1.14 -r1.15
21 --- afterstep-2.2.4.ebuild 10 Jul 2009 13:58:19 -0000 1.14
22 +++ afterstep-2.2.4.ebuild 3 Aug 2009 10:39:23 -0000 1.15
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2009 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.14 2009/07/10 13:58:19 ssuominen Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.15 2009/08/03 10:39:23 ssuominen Exp $
28
29 inherit flag-o-matic eutils
30
31 @@ -37,7 +37,7 @@
32 src_unpack() {
33 unpack ${A}
34 cd "${S}"
35 - epatch "${FILESDIR}/no-alternatives.patch"
36 + epatch "${FILESDIR}"/no-alternatives.patch
37 }
38
39 src_compile() {
40 @@ -84,32 +84,32 @@
41 # for the video device. bug #87356
42 unset DISPLAY
43
44 - make DESTDIR=${D} install || die "make install failed"
45 + emake DESTDIR="${D}" install || die "make install failed"
46
47 # This fixes a bug with shared libraries
48 - rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
49 - cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
50 - cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
51 - cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
52 - cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
53 + rm "${D}"/usr/lib/{libAfterImage.a,libAfterBase.a}
54 + cp -pPR "${S}"/libAfterImage/libAfterImage.so* "${D}"/usr/lib
55 + cp -pPR "${S}"/libAfterBase/libAfterBase.so* "${D}"/usr/lib
56 + cp -pPR "${S}"/libAfterConf/libAfterConf.so* "${D}"/usr/lib
57 + cp -pPR "${S}"/libAfterStep/libAfterStep.so* "${D}"/usr/lib
58
59 # Create a symlink from MonitorWharf to Wharf
60 - rm ${D}/usr/bin/MonitorWharf
61 + rm "${D}"/usr/bin/MonitorWharf
62 dosym /usr/bin/Wharf /usr/bin/MonitorWharf
63
64 # Handle the documentation
65 dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
66 - cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
67 + cp -pPR "${S}"/TODO "${D}"/usr/share/doc/${PF}/
68 dodir /usr/share/doc/${PF}/html
69 - cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
70 - rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
71 + cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html
72 + rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
73
74 insinto /usr/share/xsessions
75 - newins ${S}/AfterStep.desktop.final AfterStep.desktop
76 + newins "${S}"/AfterStep.desktop.final AfterStep.desktop
77
78 # For desktop managers like GDM or KDE
79 exeinto /etc/X11/Sessions
80 - doexe ${FILESDIR}/afterstep
81 + doexe "${FILESDIR}"/afterstep
82 }
83
84 pkg_postinst() {