public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild systemd-198-r5.ebuild ChangeLog
@ 2013-03-26  8:02 Michal Gorny (mgorny)
  0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-26  8:02 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/03/26 08:02:08

  Modified:             systemd-9999.ebuild systemd-198-r5.ebuild ChangeLog
  Log:
  Install udev to current udevdir to avoid breakages.
  
  (Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

Revision  Changes    Path
1.26                 sys-apps/systemd/systemd-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.25&r2=1.26

Index: systemd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- systemd-9999.ebuild	24 Mar 2013 22:12:25 -0000	1.25
+++ systemd-9999.ebuild	26 Mar 2013 08:02:07 -0000	1.26
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.25 2013/03/24 22:12:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.26 2013/03/26 08:02:07 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@
 #endif
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils linux-info multilib pam python-single-r1 systemd user
+inherit autotools-utils linux-info multilib pam python-single-r1 systemd udev user
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
@@ -130,11 +130,21 @@
 		$(use_enable xattr)
 	)
 
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(udev_get_udevdir)
+
 	autotools-utils_src_configure
 }
 
+src_compile() {
+	autotools-utils_src_compile \
+		udevlibexecdir="${MY_UDEVDIR}"
+}
+
 src_install() {
-	autotools-utils_src_install -j1 dist_udevhwdb_DATA=
+	autotools-utils_src_install -j1 \
+		udevlibexecdir="${MY_UDEVDIR}" \
+		dist_udevhwdb_DATA=
 
 	# zsh completion
 	insinto /usr/share/zsh/site-functions



1.2                  sys-apps/systemd/systemd-198-r5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild?r1=1.1&r2=1.2

Index: systemd-198-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemd-198-r5.ebuild	25 Mar 2013 12:19:36 -0000	1.1
+++ systemd-198-r5.ebuild	26 Mar 2013 08:02:07 -0000	1.2
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.1 2013/03/25 12:19:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.2 2013/03/26 08:02:07 mgorny Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils linux-info multilib pam python-single-r1 systemd user
+inherit autotools-utils linux-info multilib pam python-single-r1 systemd udev user
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
@@ -114,11 +114,21 @@
 		$(use_enable xattr)
 	)
 
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(udev_get_udevdir)
+
 	autotools-utils_src_configure
 }
 
+src_compile() {
+	autotools-utils_src_compile \
+		udevlibexecdir="${MY_UDEVDIR}"
+}
+
 src_install() {
-	autotools-utils_src_install -j1 dist_udevhwdb_DATA=
+	autotools-utils_src_install -j1 \
+		udevlibexecdir="${MY_UDEVDIR}" \
+		dist_udevhwdb_DATA=
 
 	# zsh completion
 	insinto /usr/share/zsh/site-functions



1.95                 sys-apps/systemd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.94&r2=1.95

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog	25 Mar 2013 12:19:36 -0000	1.94
+++ ChangeLog	26 Mar 2013 08:02:07 -0000	1.95
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.94 2013/03/25 12:19:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.95 2013/03/26 08:02:07 mgorny Exp $
+
+  26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
+  systemd-9999.ebuild:
+  Install udev to current udevdir to avoid breakages.
 
 *systemd-198-r5 (25 Mar 2013)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild systemd-198-r5.ebuild ChangeLog
@ 2013-03-26 16:24 Michal Gorny (mgorny)
  0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-26 16:24 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/03/26 16:24:26

  Modified:             systemd-9999.ebuild systemd-198-r5.ebuild ChangeLog
  Log:
  Use get_udevdir rather than the deprecated one. Support installing static-libs wrt bug #463250. Disable SysV compat wrt bug #463270.
  
  (Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

Revision  Changes    Path
1.27                 sys-apps/systemd/systemd-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.26&r2=1.27

Index: systemd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- systemd-9999.ebuild	26 Mar 2013 08:02:07 -0000	1.26
+++ systemd-9999.ebuild	26 Mar 2013 16:24:26 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.26 2013/03/26 08:02:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.27 2013/03/26 16:24:26 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,8 @@
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="acl audit cryptsetup doc efi gcrypt gudev http
-	introspection +kmod lzma pam python qrcode selinux tcpd vanilla xattr"
+	introspection +kmod lzma pam python qrcode selinux static-libs
+	tcpd vanilla xattr"
 
 MINKV="2.6.39"
 
@@ -107,6 +108,9 @@
 		--enable-split-usr
 		# no deps
 		--enable-keymap
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
 		# just text files
 		--enable-polkit
 		# optional components/dependencies
@@ -131,7 +135,7 @@
 	)
 
 	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(udev_get_udevdir)
+	MY_UDEVDIR=$(get_udevdir)
 
 	autotools-utils_src_configure
 }



1.3                  sys-apps/systemd/systemd-198-r5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild?r1=1.2&r2=1.3

Index: systemd-198-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- systemd-198-r5.ebuild	26 Mar 2013 08:02:07 -0000	1.2
+++ systemd-198-r5.ebuild	26 Mar 2013 16:24:26 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.2 2013/03/26 08:02:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.3 2013/03/26 16:24:26 mgorny Exp $
 
 EAPI=5
 
@@ -15,7 +15,8 @@
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="acl audit cryptsetup doc efi gcrypt gudev http
-	introspection +kmod lzma pam python qrcode selinux tcpd vanilla xattr"
+	introspection +kmod lzma pam python qrcode selinux static-libs
+	tcpd vanilla xattr"
 
 MINKV="2.6.39"
 
@@ -91,6 +92,9 @@
 		--enable-split-usr
 		# no deps
 		--enable-keymap
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
 		# just text files
 		--enable-polkit
 		# optional components/dependencies
@@ -115,7 +119,7 @@
 	)
 
 	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(udev_get_udevdir)
+	MY_UDEVDIR=$(get_udevdir)
 
 	autotools-utils_src_configure
 }
@@ -137,9 +141,6 @@
 	# remove pam.d plugin .la-file
 	prune_libtool_files --modules
 
-	# remove useless 'README' files
-	rm "${D}"/{etc/init.d,var/log}/README || die
-
 	# move nss_myhostname to rootfs (bug #460640)
 	dodir /$(get_libdir)
 	mv "${D}"/usr/$(get_libdir)/libnss_myhostname* "${D}"/$(get_libdir)/ \



1.96                 sys-apps/systemd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	26 Mar 2013 08:02:07 -0000	1.95
+++ ChangeLog	26 Mar 2013 16:24:26 -0000	1.96
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.95 2013/03/26 08:02:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.96 2013/03/26 16:24:26 mgorny Exp $
+
+  26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
+  systemd-9999.ebuild:
+  Use get_udevdir rather than the deprecated one. Support installing static-libs
+  wrt bug #463250. Disable SysV compat wrt bug #463270.
 
   26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
   systemd-9999.ebuild:





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-03-26 16:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-26  8:02 [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild systemd-198-r5.ebuild ChangeLog Michal Gorny (mgorny)
  -- strict thread matches above, loose matches on Subject: below --
2013-03-26 16:24 Michal Gorny (mgorny)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox