Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-210.ebuild systemd-9999.ebuild ChangeLog
Date: Tue, 25 Feb 2014 18:03:07
Message-Id: 20140225180300.C414B2004C@flycatcher.gentoo.org
1 mgorny 14/02/25 18:03:00
2
3 Modified: systemd-210.ebuild systemd-9999.ebuild ChangeLog
4 Log:
5 Fix installing compat pkg-config files for multilib.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.2 sys-apps/systemd/systemd-210.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-210.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-210.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-210.ebuild?r1=1.1&r2=1.2
15
16 Index: systemd-210.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-210.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- systemd-210.ebuild 25 Feb 2014 15:07:13 -0000 1.1
23 +++ systemd-210.ebuild 25 Feb 2014 18:03:00 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-210.ebuild,v 1.1 2014/02/25 15:07:13 mgorny Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-210.ebuild,v 1.2 2014/02/25 18:03:00 mgorny Exp $
29
30 EAPI=5
31
32 @@ -271,11 +271,6 @@
33 # Even with --enable-networkd, it's not right to have this running by default
34 # when it's unconfigured.
35 rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
36 -
37 - # install compat pkg-config files
38 - local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
39 - emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
40 - pkgconfiglib_DATA="${pcfiles[*]}"
41 else
42 mymakeopts+=(
43 install-libLTLIBRARIES
44 @@ -288,6 +283,11 @@
45
46 emake "${mymakeopts[@]}"
47 fi
48 +
49 + # install compat pkg-config files
50 + local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
51 + emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
52 + pkgconfiglib_DATA="${pcfiles[*]}"
53 }
54
55 multilib_src_install_all() {
56
57
58
59 1.94 sys-apps/systemd/systemd-9999.ebuild
60
61 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.94&view=markup
62 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.94&content-type=text/plain
63 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.93&r2=1.94
64
65 Index: systemd-9999.ebuild
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
68 retrieving revision 1.93
69 retrieving revision 1.94
70 diff -u -r1.93 -r1.94
71 --- systemd-9999.ebuild 25 Feb 2014 15:07:13 -0000 1.93
72 +++ systemd-9999.ebuild 25 Feb 2014 18:03:00 -0000 1.94
73 @@ -1,6 +1,6 @@
74 # Copyright 1999-2014 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.93 2014/02/25 15:07:13 mgorny Exp $
77 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.94 2014/02/25 18:03:00 mgorny Exp $
78
79 EAPI=5
80
81 @@ -292,11 +292,6 @@
82 # Even with --enable-networkd, it's not right to have this running by default
83 # when it's unconfigured.
84 rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
85 -
86 - # install compat pkg-config files
87 - local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
88 - emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
89 - pkgconfiglib_DATA="${pcfiles[*]}"
90 else
91 mymakeopts+=(
92 install-libLTLIBRARIES
93 @@ -309,6 +304,11 @@
94
95 emake "${mymakeopts[@]}"
96 fi
97 +
98 + # install compat pkg-config files
99 + local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
100 + emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
101 + pkgconfiglib_DATA="${pcfiles[*]}"
102 }
103
104 multilib_src_install_all() {
105
106
107
108 1.229 sys-apps/systemd/ChangeLog
109
110 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.229&view=markup
111 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.229&content-type=text/plain
112 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.228&r2=1.229
113
114 Index: ChangeLog
115 ===================================================================
116 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
117 retrieving revision 1.228
118 retrieving revision 1.229
119 diff -u -r1.228 -r1.229
120 --- ChangeLog 25 Feb 2014 15:07:13 -0000 1.228
121 +++ ChangeLog 25 Feb 2014 18:03:00 -0000 1.229
122 @@ -1,6 +1,10 @@
123 # ChangeLog for sys-apps/systemd
124 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
125 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.228 2014/02/25 15:07:13 mgorny Exp $
126 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.229 2014/02/25 18:03:00 mgorny Exp $
127 +
128 + 25 Feb 2014; Michał Górny <mgorny@g.o> systemd-210.ebuild,
129 + systemd-9999.ebuild:
130 + Fix installing compat pkg-config files for multilib.
131
132 *systemd-210 (25 Feb 2014)
Report Message
Find on MARC Find on Google Groups