remove old patch

Package-Manager: portage-2.2.0_alpha53/cvs/Linux i686

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 0b5b70257f2efbb18beade010f1721a284be9861..dc7457b3b4e885ed26936b5ee3608d8c2821ab0d 100644 (file)
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.509 2011/08/10 18:14:58 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.510 2011/09/04 15:47:56 williamh Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  04 Sep 2011; William Hubbs <williamh@gentoo.org>
+  -files/baselayout-2.0.1-proc_touch.patch:
+  remove old patch
+
   10 Aug 2011; William Hubbs <williamh@gentoo.org> -baselayout-2.0.1-r1.ebuild,
   -baselayout-2.0.2.ebuild:
   remove old 2.0 versions

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index e666cd6a7ceeb24582a6954ebe361fedb5441a58..767dac0240b3f0f1fb4e29d90a7c855bacd7d78e 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -2,17 +2,16 @@
 Hash: SHA1
 
 AUX baselayout-1.12.14-iproute.patch 633 RMD160 50419eb79bfac3e44bdfa1c0558e267cf5772578 SHA1 0b4d58f7736024b2dbbbe1e79fdbf4fb254db478 SHA256 d30480e75024953ac64a51cf7a3d54f4f975470219da2cec9ad0832b5ff6eff9
-AUX baselayout-2.0.1-proc_touch.patch 528 RMD160 857f43c38e61cc719b711c99c46d9cee5c6042b0 SHA1 bd3ed9b9805b284f62ee7c66814195ace475569d SHA256 5c8108347da5881ba982a4c8831b846393d6c6928d6497f021633e45d6f3ab39
 DIST baselayout-1.12.14.tar.bz2 270679 RMD160 403731fb5d7acb6da26d660ae79661506114a387 SHA1 c425706243a38b321d6f786923a973f15ebe7f0e SHA256 81890e1a17666cc1ae490e4bb963ddc8b9aba8891ba3175a1869444200267ebc
 DIST baselayout-2.0.3.tar.bz2 39969 RMD160 ca4ae235382780cd386c89f0147fbe17bb599414 SHA1 c5dbcc2d131254b2bb14b782101e2318d1dfcd2d SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd
 EBUILD baselayout-1.12.14-r1.ebuild 19239 RMD160 793bf5292ab0bc4b97c790a22defbb959b3ac69b SHA1 94371e97745e0082a2b28d0c1db1c457b8c36a17 SHA256 e8325d9871c0e972cf64f83866e73debd166226fd0bc81c4f4d5b5a2ba6c490f
 EBUILD baselayout-2.0.3.ebuild 7366 RMD160 579ac15844268e72cd9e1f593501e9a5806f4043 SHA1 3dcb7064e613d063fbe2428f7e3f57d92a2d9219 SHA256 e72e760fbc2452212fee89e5f4c00437b11d7973b5c27933c58481e9a656f5a4
-MISC ChangeLog 107055 RMD160 1203e1567bf8dd1b2b95f0ba2e3a0b86a7ccd664 SHA1 d1313b9e0414f89bf6b82775cd0875875f5bd4f7 SHA256 9108deea402dbddc054f3cb1328de1463c61db8af47a3f6f264c1513e9730ad8
+MISC ChangeLog 107170 RMD160 be1d101f847a6a070c23e299ca7e3df0b809b85a SHA1 74f047ebee3bb1cc7507cd1aa4f76a7b302ee7e9 SHA256 58a8b2d4b9c213308c32bc5ec2af728805baa3968008d9f5d12b7263879ab70c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5CyrgACgkQblQW9DDEZThebQCffEqr123yogRLAaKErUseWX3r
-/hoAoI58Do1NBtHMQg5F8wFcrN8Rk/eM
-=PG0j
+iEYEARECAAYFAk5jnTMACgkQblQW9DDEZThFSACgnye0FprlB2VHtfF1GwJL8z8I
+DZMAnA8Xw1SKnHZRQpMyM6oEl0HXVuPA
+=eLD5
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/baselayout/files/baselayout-2.0.1-proc_touch.patch b/sys-apps/baselayout/files/baselayout-2.0.1-proc_touch.patch
deleted file mode 100644 (file)
index 7b7df78..0000000
--- a/sys-apps/baselayout/files/baselayout-2.0.1-proc_touch.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/232823
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/baselayout/trunk/Makefile?r1=3171&r2=3172
-
---- Makefile
-+++ Makefile
-@@ -49,8 +49,9 @@
- layout:
-       # Create base filesytem layout
-       for x in $(KEEP_DIRS) ; do \
-+              test -e $(DESTDIR)$$x/.keep && continue ; \
-               $(INSTALL_DIR) $(DESTDIR)$$x || exit $$? ; \
--              touch $(DESTDIR)$$x/.keep || exit $$? ; \
-+              touch $(DESTDIR)$$x/.keep || echo "ignoring touch failure; mounted fs?" ; \
-       done
-       # Special dirs
-       install -m 0700 -d $(DESTDIR)/root || exit $$?