merged upstream

diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest
index ecfaa76ac89df5c8738c820f4b87c54dc3fbd942..5bb94c6cdbeaa4c282d4d8a269999627fe07b60a 100644 (file)
--- a/sys-apps/eject/Manifest
+++ b/sys-apps/eject/Manifest
@@ -1,30 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 6ad3c8045456a789af1971b0d6527302 eject-2.1.0.ebuild 1412
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 35241bc9ea850572d8d7275f822b8162 eject-2.0.13-r1.ebuild 1109
 MD5 f400e0734b5580302979f8db3c8b872b eject-2.0.13-r2.ebuild 1564
-MD5 0434bae7a14860ba6163e21f59136654 ChangeLog 5323
+MD5 06704c1f9e66d35902d3fab080a6c560 ChangeLog 5549
 MD5 9ce8b7632acf54813ee4336d89293b53 files/eject-2.0.13-prefix-defaultdevice-with-dev.patch 488
+MD5 342a30a8b7f066819287f915db430865 files/digest-eject-2.1.0 62
 MD5 c72d5d5d53d6390c871f8ee901770c7b files/eject-2.0.13-finddev.patch 1978
 MD5 c7f02cf0dea0ee27a338220804de25ab files/eject-2.0.13-header.patch 848
 MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r2 63
 MD5 6511dfbfe2029a7e582f958af0d41ca7 files/eject-2.0.13-xregcomp.patch 649
 MD5 4c62f46d6d72dd079fd677db6ae57059 files/eject-2.0.13-xmalloc.patch 654
+MD5 dd1b8295e14d3b2ee85a9f06860a5a9f files/eject-2.1.0-regcomp-check.patch 503
 MD5 0109237261a5ce6357ddcd041259e61e files/eject-2.0.13-toggle.patch 2838
 MD5 b92a6e4f192ffefdc4ad665fba3ed4a7 files/eject-2.0.13-i18n-uclibc.patch 645
 MD5 c5613bc078215c657678c57e387731ac files/eject-2.0.13-close-check.patch 1405
 MD5 9741dfe0732a1a137742fc5302acb007 files/eject-2.0.13-pumount.patch 896
-MD5 3f842146dbaced2c09bf45e5cf14b8c8 files/eject-2.0.13-autoclose.patch 699
+MD5 b60886258cade258841187669f401bb9 files/eject-2.1.0-scsi-io-update.patch 2949
+MD5 79ae9b9c17b25df97606a29a7bb47150 files/eject-2.0.13-autoclose.patch 726
 MD5 f9dc8e0281dbe9fd3f4db87d5ecfc69e files/eject-2.0.13-kernel25-support.patch 458
 MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r1 63
-MD5 79bfd06f7b36f98ebfe676e8e37e4955 files/eject-2.0.13-use-mountpoints.patch 1100
+MD5 9a4e89b1944feaa8da40749822de0f44 files/eject-2.0.13-use-mountpoints.patch 965
 MD5 31688554edc80b2d6cf1ae427a6533f7 files/eject-2.0.13-fstab-error.patch 956
 MD5 ba37ff5a9223af8de446a18e62dbe19d files/eject-2.0.13-no-umount.patch 2496
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLdnsgIKl8Uu19MoRAnrLAJ0a4cvQaIRjlaVVNaBB8tvJPn9kmwCeN8JS
-tibBVcxlrs8jznnznPgIzpE=
-=0R/l
------END PGP SIGNATURE-----

diff --git a/sys-apps/eject/files/eject-2.0.13-autoclose.patch b/sys-apps/eject/files/eject-2.0.13-autoclose.patch
index 9d3662b19c05a655f762089ce23e6a9f4d8c14b8..c6a13a4b66fc8123e9581983ecab2b5047a166ac 100644 (file)
--- a/sys-apps/eject/files/eject-2.0.13-autoclose.patch
+++ b/sys-apps/eject/files/eject-2.0.13-autoclose.patch
@@ -1,4 +1,4 @@
-Ripped from Fedora
+Ripped from Fedora [has been merged upstream]
 
 --- eject.c    Tue Jul  3 00:17:41 2001
 +++ eject.c    Tue Feb  5 05:50:58 2002

diff --git a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
index 9b12992a7c280e4b9510f358b3ed1ac5c2d5dfde..a508c81967491536f6f15d609c3a970efb8f4f5d 100644 (file)
--- a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
+++ b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
@@ -1,4 +1,4 @@
-Ripped from Fedora
+Ripped from Fedora [merged upstream]
 
 More recent kernels actually want to umount using the mount point and
 not the device name (this makes more sense, you can have the same
@@ -6,9 +6,8 @@ device mounted in many places).
 
 This is a minor changes to do just that.
 
-diff --exclude=debian -Nur eject-2.0.13deb/eject.c eject-2.0.13deb.cw/eject.c
---- eject-2.0.13deb/eject.c    2004-04-17 12:25:10.000000000 -0700
-+++ eject-2.0.13deb.cw/eject.c 2004-04-17 12:26:55.000000000 -0700
+--- eject-2.0.13deb/eject.c
++++ eject-2.0.13deb/eject.c
 @@ -718,8 +718,8 @@
                        status = regexec(&preg, s1, 0, 0, 0);
                        if (status == 0) {