From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 12466138010 for ; Fri, 21 Sep 2012 21:33:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6177EE0212; Fri, 21 Sep 2012 21:32:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 226E9E0212 for ; Fri, 21 Sep 2012 21:32:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C44B33C900 for ; Fri, 21 Sep 2012 21:32:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0B290E5445 for ; Fri, 21 Sep 2012 21:32:54 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1348263178.5f862c398fdceb60530fb2b2b4e78e19a1ea2bdb.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5f862c398fdceb60530fb2b2b4e78e19a1ea2bdb X-VCS-Branch: master Date: Fri, 21 Sep 2012 21:32:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4b7b5a50-6f2c-4119-9898-9e1349d8703f X-Archives-Hash: 9cef291b3e4d8af3e6ad4c04e90fbf4a commit: 5f862c398fdceb60530fb2b2b4e78e19a1ea2bdb Author: Michał Górny gentoo org> AuthorDate: Fri Sep 21 21:32:58 2012 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Sep 21 21:32:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=5f862c39 sys-apps/systemd: Update for v190. (Portage version: 2.2.0_alpha127/git/Linux x86_64, unsigned Manifest commit) --- ...> 0001-Disable-udev-targets-for-udev-190.patch} | 45 ++++++++++---------- sys-apps/systemd/systemd-9999.ebuild | 10 ++++- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch similarity index 88% rename from sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch rename to sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch index 05b4a9d..fb70b80 100644 --- a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch +++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch @@ -1,17 +1,17 @@ -From 700023b0263f1f014443144a10e4544f18113458 Mon Sep 17 00:00:00 2001 +From 202a70158973fee73432816d2b7612161824cc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 15 Aug 2012 14:02:07 +0200 -Subject: [PATCH] Disable udev targets, for udev-189. +Subject: [PATCH] Disable udev targets, for udev-190. --- - Makefile.am | 189 +----------------------------------------------------------- - 1 file changed, 1 insertion(+), 188 deletions(-) + Makefile.am | 190 +----------------------------------------------------------- + 1 file changed, 1 insertion(+), 189 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 8de4aa4..5fa3085 100644 +index 64dfe81..a378007 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -307,8 +307,6 @@ dist_systemunit_DATA = \ +@@ -309,8 +309,6 @@ dist_systemunit_DATA = \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ units/syslog.target \ @@ -20,7 +20,7 @@ index 8de4aa4..5fa3085 100644 units/system-update.target nodist_systemunit_DATA = \ -@@ -338,9 +336,6 @@ nodist_systemunit_DATA = \ +@@ -340,9 +338,6 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.service \ units/systemd-fsck-root.service \ @@ -30,7 +30,7 @@ index 8de4aa4..5fa3085 100644 units/debug-shell.service dist_userunit_DATA = \ -@@ -1588,12 +1583,6 @@ SUBDIRS += \ +@@ -1643,12 +1638,6 @@ SUBDIRS += \ docs/libudev endif @@ -43,7 +43,7 @@ index 8de4aa4..5fa3085 100644 libudev_la_SOURCES =\ src/libudev/libudev-private.h \ src/libudev/libudev.c \ -@@ -1616,9 +1605,6 @@ libudev_la_LDFLAGS = \ +@@ -1671,9 +1660,6 @@ libudev_la_LDFLAGS = \ libudev_la_LIBADD = \ libsystemd-shared.la @@ -53,7 +53,7 @@ index 8de4aa4..5fa3085 100644 EXTRA_DIST += \ src/libudev/libudev.pc.in \ src/libudev/libudev.sym -@@ -1639,12 +1625,7 @@ libudev-install-move-hook: +@@ -1694,12 +1680,7 @@ libudev-install-move-hook: libudev-uninstall-move-hook: rm -f $(DESTDIR)$(rootlibdir)/libudev.so* @@ -66,7 +66,7 @@ index 8de4aa4..5fa3085 100644 libudev_private_la_SOURCES =\ $(libudev_la_SOURCES) \ -@@ -1659,15 +1640,6 @@ libudev_private_la_LIBADD = \ +@@ -1714,15 +1695,6 @@ libudev_private_la_LIBADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -82,7 +82,7 @@ index 8de4aa4..5fa3085 100644 man/systemd-udevd.8: man/systemd-udevd.service.8 man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 -@@ -1679,27 +1651,7 @@ udev-confdirs: +@@ -1734,28 +1706,7 @@ udev-confdirs: INSTALL_DATA_HOOKS += udev-confdirs dist_udevrules_DATA += \ @@ -94,6 +94,7 @@ index 8de4aa4..5fa3085 100644 - rules/60-persistent-input.rules \ - rules/60-persistent-alsa.rules \ - rules/60-persistent-storage.rules \ +- rules/64-btrfs.rules \ - rules/75-net-description.rules \ - rules/75-tty-description.rules \ - rules/78-sound-card.rules \ @@ -111,7 +112,7 @@ index 8de4aa4..5fa3085 100644 EXTRA_DIST += \ rules/99-systemd.rules.in \ -@@ -1727,17 +1679,6 @@ systemd-install-hook: +@@ -1783,17 +1734,6 @@ systemd-install-hook: ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service @@ -129,7 +130,7 @@ index 8de4aa4..5fa3085 100644 libudev_core_la_SOURCES = \ src/udev/udev.h \ src/udev/udev-event.c \ -@@ -1803,14 +1744,6 @@ udevadm_LDADD = \ +@@ -1860,14 +1800,6 @@ udevadm_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -144,7 +145,7 @@ index 8de4aa4..5fa3085 100644 test_libudev_SOURCES = \ src/test/test-libudev.c -@@ -1860,8 +1793,6 @@ ata_id_LDADD = \ +@@ -1917,8 +1849,6 @@ ata_id_LDADD = \ libudev-private.la \ libsystemd-shared.la @@ -153,7 +154,7 @@ index 8de4aa4..5fa3085 100644 # ------------------------------------------------------------------------------ cdrom_id_SOURCES = \ -@@ -1871,12 +1802,6 @@ cdrom_id_LDADD = \ +@@ -1928,12 +1858,6 @@ cdrom_id_LDADD = \ -ludev \ libsystemd-shared.la @@ -166,7 +167,7 @@ index 8de4aa4..5fa3085 100644 # ------------------------------------------------------------------------------ collect_SOURCES = \ src/udev/collect/collect.c -@@ -1884,9 +1809,6 @@ collect_SOURCES = \ +@@ -1941,9 +1865,6 @@ collect_SOURCES = \ collect_LDADD = \ libudev-private.la @@ -176,7 +177,7 @@ index 8de4aa4..5fa3085 100644 # ------------------------------------------------------------------------------ scsi_id_SOURCES =\ src/udev/scsi_id/scsi_id.c \ -@@ -1898,9 +1820,6 @@ scsi_id_LDADD = \ +@@ -1955,9 +1876,6 @@ scsi_id_LDADD = \ libudev-private.la \ libsystemd-shared.la @@ -186,7 +187,7 @@ index 8de4aa4..5fa3085 100644 EXTRA_DIST += \ src/udev/scsi_id/README -@@ -1911,12 +1830,6 @@ v4l_id_SOURCES = \ +@@ -1968,12 +1886,6 @@ v4l_id_SOURCES = \ v4l_id_LDADD = \ -ludev @@ -199,7 +200,7 @@ index 8de4aa4..5fa3085 100644 # ------------------------------------------------------------------------------ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c -@@ -1925,12 +1838,6 @@ accelerometer_LDADD = \ +@@ -1982,12 +1894,6 @@ accelerometer_LDADD = \ -ludev -lm \ libsystemd-shared.la @@ -212,7 +213,7 @@ index 8de4aa4..5fa3085 100644 # ------------------------------------------------------------------------------ if ENABLE_GUDEV if ENABLE_GTK_DOC -@@ -2111,99 +2018,11 @@ nodist_keymap_SOURCES = \ +@@ -2168,99 +2074,11 @@ nodist_keymap_SOURCES = \ BUILT_SOURCES += \ $(nodist_keymap_SOURCES) @@ -312,7 +313,7 @@ index 8de4aa4..5fa3085 100644 src/udev/keymap/keys.txt: Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ -@@ -2231,12 +2050,6 @@ mtd_probe_SOURCES = \ +@@ -2288,12 +2106,6 @@ mtd_probe_SOURCES = \ mtd_probe_CPPFLAGS = \ $(AM_CPPFLAGS) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 6d60efa..db1d6ed 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -28,7 +28,7 @@ MINKV="2.6.39" COMMON_DEPEND=">=sys-apps/dbus-1.4.10 >=sys-apps/kmod-5 >=sys-apps/util-linux-2.20 - ~sys-fs/udev-189 + ~sys-fs/udev-190 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) @@ -48,12 +48,15 @@ RDEPEND="${COMMON_DEPEND} ) !