| 1 |
williamh 12/01/09 14:27:36 |
| 2 |
|
| 3 |
Modified: kmod-9999.ebuild metadata.xml kmod-3.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Fix compatibility symlinks for bug #397949 and add a compat use flag for installing them. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha84/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.5 sys-apps/kmod/kmod-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.5&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.5&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.4&r2=1.5 |
| 16 |
|
| 17 |
Index: kmod-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v |
| 20 |
retrieving revision 1.4 |
| 21 |
retrieving revision 1.5 |
| 22 |
diff -u -r1.4 -r1.5 |
| 23 |
--- kmod-9999.ebuild 4 Jan 2012 23:55:50 -0000 1.4 |
| 24 |
+++ kmod-9999.ebuild 9 Jan 2012 14:27:36 -0000 1.5 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.4 2012/01/04 23:55:50 williamh Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.5 2012/01/09 14:27:36 williamh Exp $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
|
| 33 |
@@ -20,10 +20,13 @@ |
| 34 |
|
| 35 |
LICENSE="LGPL-2" |
| 36 |
SLOT="0" |
| 37 |
-IUSE="debug lzma static-libs +tools zlib" |
| 38 |
+IUSE="+compat debug lzma static-libs +tools zlib" |
| 39 |
|
| 40 |
-DEPEND="zlib? ( sys-libs/zlib ) |
| 41 |
- lzma? ( app-arch/xz-utils )" |
| 42 |
+REQUIRED_USE="compat? ( tools )" |
| 43 |
+ |
| 44 |
+DEPEND="compat? ( !!sys-apps/module-init-tools ) |
| 45 |
+ lzma? ( app-arch/xz-utils ) |
| 46 |
+ zlib? ( sys-libs/zlib )" |
| 47 |
RDEPEND="${DEPEND}" |
| 48 |
|
| 49 |
src_prepare() |
| 50 |
@@ -52,10 +55,10 @@ |
| 51 |
# we have a .pc file for people to use |
| 52 |
find "${D}" -name libkmod.la -delete |
| 53 |
|
| 54 |
- # If the tools are installed, add compatibility symbolic links |
| 55 |
- if use tools; then |
| 56 |
+ if use compat; then |
| 57 |
+ dodir /sbin |
| 58 |
for cmd in depmod insmod lsmod modinfo modprobe rmmod; do |
| 59 |
- dosym kmod /usr/bin/$cmd |
| 60 |
+ dosym /usr/bin/kmod /sbin/$cmd |
| 61 |
done |
| 62 |
fi |
| 63 |
} |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.7 sys-apps/kmod/metadata.xml |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/metadata.xml?rev=1.7&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/metadata.xml?rev=1.7&content-type=text/plain |
| 71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/metadata.xml?r1=1.6&r2=1.7 |
| 72 |
|
| 73 |
Index: metadata.xml |
| 74 |
=================================================================== |
| 75 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/metadata.xml,v |
| 76 |
retrieving revision 1.6 |
| 77 |
retrieving revision 1.7 |
| 78 |
diff -u -r1.6 -r1.7 |
| 79 |
--- metadata.xml 5 Jan 2012 15:55:52 -0000 1.6 |
| 80 |
+++ metadata.xml 9 Jan 2012 14:27:36 -0000 1.7 |
| 81 |
@@ -7,6 +7,7 @@ |
| 82 |
</maintainer> |
| 83 |
|
| 84 |
<use> |
| 85 |
+ <flag name='compat'>Install module-init-tools compatible symlinks.</flag> |
| 86 |
<flag name='tools'>Install module loading/unloading tools.</flag> |
| 87 |
</use> |
| 88 |
</pkgmetadata> |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.2 sys-apps/kmod/kmod-3.ebuild |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-3.ebuild?rev=1.2&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-3.ebuild?rev=1.2&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-3.ebuild?r1=1.1&r2=1.2 |
| 97 |
|
| 98 |
Index: kmod-3.ebuild |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-3.ebuild,v |
| 101 |
retrieving revision 1.1 |
| 102 |
retrieving revision 1.2 |
| 103 |
diff -u -r1.1 -r1.2 |
| 104 |
--- kmod-3.ebuild 5 Jan 2012 15:55:52 -0000 1.1 |
| 105 |
+++ kmod-3.ebuild 9 Jan 2012 14:27:36 -0000 1.2 |
| 106 |
@@ -1,6 +1,6 @@ |
| 107 |
# Copyright 1999-2012 Gentoo Foundation |
| 108 |
# Distributed under the terms of the GNU General Public License v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-3.ebuild,v 1.1 2012/01/05 15:55:52 williamh Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-3.ebuild,v 1.2 2012/01/09 14:27:36 williamh Exp $ |
| 111 |
|
| 112 |
EAPI=4 |
| 113 |
|
| 114 |
@@ -20,10 +20,13 @@ |
| 115 |
|
| 116 |
LICENSE="LGPL-2" |
| 117 |
SLOT="0" |
| 118 |
-IUSE="debug lzma static-libs +tools zlib" |
| 119 |
+IUSE="+compat debug lzma static-libs +tools zlib" |
| 120 |
|
| 121 |
-DEPEND="zlib? ( sys-libs/zlib ) |
| 122 |
- lzma? ( app-arch/xz-utils )" |
| 123 |
+REQUIRED_USE="compat? ( tools )" |
| 124 |
+ |
| 125 |
+DEPEND="compat? ( !!sys-apps/module-init-tools ) |
| 126 |
+ lzma? ( app-arch/xz-utils ) |
| 127 |
+ zlib? ( sys-libs/zlib )" |
| 128 |
RDEPEND="${DEPEND}" |
| 129 |
|
| 130 |
src_prepare() |
| 131 |
@@ -52,10 +55,10 @@ |
| 132 |
# we have a .pc file for people to use |
| 133 |
find "${D}" -name libkmod.la -delete |
| 134 |
|
| 135 |
- # If the tools are installed, add compatibility symbolic links |
| 136 |
- if use tools; then |
| 137 |
+ if use compat; then |
| 138 |
+ dodir /sbin |
| 139 |
for cmd in depmod insmod lsmod modinfo modprobe rmmod; do |
| 140 |
- dosym kmod /usr/bin/$cmd |
| 141 |
+ dosym /usr/bin/kmod /sbin/$cmd |
| 142 |
done |
| 143 |
fi |
| 144 |
} |
| 145 |
|
| 146 |
|
| 147 |
|
| 148 |
1.9 sys-apps/kmod/ChangeLog |
| 149 |
|
| 150 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.9&view=markup |
| 151 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.9&content-type=text/plain |
| 152 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.8&r2=1.9 |
| 153 |
|
| 154 |
Index: ChangeLog |
| 155 |
=================================================================== |
| 156 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v |
| 157 |
retrieving revision 1.8 |
| 158 |
retrieving revision 1.9 |
| 159 |
diff -u -r1.8 -r1.9 |
| 160 |
--- ChangeLog 5 Jan 2012 15:55:52 -0000 1.8 |
| 161 |
+++ ChangeLog 9 Jan 2012 14:27:36 -0000 1.9 |
| 162 |
@@ -1,6 +1,11 @@ |
| 163 |
# ChangeLog for sys-apps/kmod |
| 164 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 165 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.8 2012/01/05 15:55:52 williamh Exp $ |
| 166 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.9 2012/01/09 14:27:36 williamh Exp $ |
| 167 |
+ |
| 168 |
+ 09 Jan 2012; William Hubbs <williamh@g.o> kmod-3.ebuild, |
| 169 |
+ kmod-9999.ebuild, metadata.xml: |
| 170 |
+ Fix compatibility symlinks for bug #397949 and add a compat use flag for |
| 171 |
+ installing them. |
| 172 |
|
| 173 |
*kmod-3 (05 Jan 2012) |
Archives