Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/files/, x11-misc/tint2/
Date: Tue, 29 Aug 2017 18:39:53
Message-Id: 1504031837.d9d4b0be19190f0ad5c610cf07c574425bcf7ff9.amynka@gentoo
1 commit: d9d4b0be19190f0ad5c610cf07c574425bcf7ff9
2 Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 29 18:34:06 2017 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 29 18:37:17 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d4b0be
7
8 x11-misc/tint2: fix path tint2rc bug #629312
9
10 Submitted-by: Chris Mayo <aklhfex <AT> gmail.com>
11
12 Package-Manager: Portage-2.3.6, Repoman-2.3.1
13
14 .../{0.14.6-sysconfdir-xdg.patch => 0.14.6-sysconfdir-xdg2.patch} | 2 +-
15 x11-misc/tint2/{tint2-0.14.6-r1.ebuild => tint2-0.14.6-r2.ebuild} | 3 ++-
16 2 files changed, 3 insertions(+), 2 deletions(-)
17
18 diff --git a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
19 similarity index 86%
20 rename from x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch
21 rename to x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
22 index 73da5b15a41..6b29b49aaf7 100644
23 --- a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch
24 +++ b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
25 @@ -5,7 +5,7 @@
26 install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
27 install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
28 -install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
29 -+install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/xdg/tint2 )
30 ++install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
31 install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
32 install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
33 install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
34
35 diff --git a/x11-misc/tint2/tint2-0.14.6-r1.ebuild b/x11-misc/tint2/tint2-0.14.6-r2.ebuild
36 similarity index 95%
37 rename from x11-misc/tint2/tint2-0.14.6-r1.ebuild
38 rename to x11-misc/tint2/tint2-0.14.6-r2.ebuild
39 index 7e9b1d53672..bc7cd9da3b2 100644
40 --- a/x11-misc/tint2/tint2-0.14.6-r1.ebuild
41 +++ b/x11-misc/tint2/tint2-0.14.6-r2.ebuild
42 @@ -31,7 +31,8 @@ DEPEND="
43 "
44 RDEPEND="${DEPEND}"
45
46 -PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg.patch" )
47 +# bug 629312
48 +PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg2.patch" )
49
50 src_configure() {
51 local mycmakeargs=(