1 |
commit: c3577544468e599bcaf85122d5fa370dcdf0edc0 |
2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
3 |
AuthorDate: Fri Aug 30 13:16:26 2013 +0000 |
4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
5 |
CommitDate: Fri Aug 30 13:16:26 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=c3577544 |
7 |
|
8 |
sys-freebsd/freebsd-contrib-9999_p255023: removed libodialog and sort |
9 |
|
10 |
http://svnweb.freebsd.org/base?view=revision&revision=227953 |
11 |
/var/tmp/portage/sys-freebsd/freebsd-contrib-9999_p255023/work/usr.bin/sort |
12 |
|
13 |
sort is an important command. |
14 |
/usr/lib/portage/bin/ebuild.sh: line 502: sort: command not found |
15 |
|
16 |
--- |
17 |
sys-freebsd/freebsd-contrib/Manifest | 2 +- |
18 |
.../freebsd-contrib/freebsd-contrib-9999_p255023.ebuild | 14 +------------- |
19 |
sys-freebsd/freebsd-lib/Manifest | 3 ++- |
20 |
sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild | 10 +++++++--- |
21 |
4 files changed, 11 insertions(+), 18 deletions(-) |
22 |
|
23 |
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest |
24 |
index d64124f..b3a06e4 100644 |
25 |
--- a/sys-freebsd/freebsd-contrib/Manifest |
26 |
+++ b/sys-freebsd/freebsd-contrib/Manifest |
27 |
@@ -1,2 +1,2 @@ |
28 |
EBUILD freebsd-contrib-9.9999.ebuild 1092 SHA256 90a4e905a49f318d4be556e9671d6e535d941acfd116b9dfdedab16cd9cdef6b SHA512 d3b5e836fc4ec43938480256f011f74b44ee55f995ef0ebfd10be5c67c81b2bea365c1a1a8899cca387b19c4c847a80f5877200d41c02dc7274a4f4d386d57c7 WHIRLPOOL 358b2e4fcffee717801135da32e48bd58595a439b78de69739b7c696e46bc207a52e998a7f34cbedd41297bdc33f80ba3ff0100deaa0d8cb1133d8ea28685346 |
29 |
-EBUILD freebsd-contrib-9999_p255023.ebuild 1092 SHA256 90a4e905a49f318d4be556e9671d6e535d941acfd116b9dfdedab16cd9cdef6b SHA512 d3b5e836fc4ec43938480256f011f74b44ee55f995ef0ebfd10be5c67c81b2bea365c1a1a8899cca387b19c4c847a80f5877200d41c02dc7274a4f4d386d57c7 WHIRLPOOL 358b2e4fcffee717801135da32e48bd58595a439b78de69739b7c696e46bc207a52e998a7f34cbedd41297bdc33f80ba3ff0100deaa0d8cb1133d8ea28685346 |
30 |
+EBUILD freebsd-contrib-9999_p255023.ebuild 849 SHA256 88684fee9129932c40f16c3377e0628a265293c3e575cd8ea5e040c17f9afcdc SHA512 9ea220341eaf393f9ec23b8e1c484b023cf7c0dcebba9668f601d9791faf8fb44066f3b987ab3e778201f4d59fd96a05045df37eb0ebb96705f23cc8b2b0bbe1 WHIRLPOOL fdd468d5760a0a6dc7a5f8c3277156df81d4646a76ddd26bb760333638d66026085299e46f49525ceac48c46c86fec815643aae463e40bdcc6b237164f1f127a |
31 |
|
32 |
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9999_p255023.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9999_p255023.ebuild |
33 |
index aefd6e2..a67c784 100644 |
34 |
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9999_p255023.ebuild |
35 |
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9999_p255023.ebuild |
36 |
@@ -14,19 +14,13 @@ LICENSE="BSD GPL-2+ libodialog" |
37 |
SLOT="0" |
38 |
IUSE="" |
39 |
|
40 |
-RDEPEND="" |
41 |
+RDEPEND="=sys-freebsd/freebsd-ubin-${RV}*" |
42 |
DEPEND="=sys-freebsd/freebsd-sources-${RV}* |
43 |
=sys-freebsd/freebsd-mk-defs-${RV}*" |
44 |
|
45 |
S="${WORKDIR}/gnu" |
46 |
|
47 |
src_compile() { |
48 |
- cd "${S}/lib/libodialog" |
49 |
- freebsd_src_compile |
50 |
- |
51 |
- cd "${S}/usr.bin/sort" |
52 |
- freebsd_src_compile |
53 |
- |
54 |
cd "${S}/usr.bin/patch" |
55 |
freebsd_src_compile |
56 |
} |
57 |
@@ -35,12 +29,6 @@ src_install() { |
58 |
use profile || mymakeopts="${mymakeopts} NO_PROFILE= " |
59 |
mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " |
60 |
|
61 |
- cd "${S}/lib/libodialog" |
62 |
- mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed" |
63 |
- |
64 |
- cd "${S}/usr.bin/sort" |
65 |
- mkinstall BINDIR="/bin/" || die "sort install failed" |
66 |
- |
67 |
cd "${S}/usr.bin/patch" |
68 |
mkinstall BINDIR="/usr/bin/" || die "patch install failed" |
69 |
} |
70 |
|
71 |
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest |
72 |
index 8538f2e..842fb5f 100644 |
73 |
--- a/sys-freebsd/freebsd-lib/Manifest |
74 |
+++ b/sys-freebsd/freebsd-lib/Manifest |
75 |
@@ -13,6 +13,7 @@ AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4 |
76 |
AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133 |
77 |
AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414 |
78 |
AUX freebsd-lib-9.2-liblink.patch 2012 SHA256 065522cabf7dca8062f41c7c9154931864ec3304a2c1f59d44f88b894bf55afc SHA512 97f2f326f431337da5d14a4a37b6fced3224c85bb25ea1f0fcd121790d94dbfb27c98c7b15eb92b1967634be15db96653d5bc6fc458de63a4c988e9e650d965d WHIRLPOOL 45392c571d0f05130836d6d4f0d6b3503f58e4f4d8907d07e1011329b9285d6a010bc35606ff74d529906f6c8f240336bc265eef105196cd3e26390b3bac6d77 |
79 |
+AUX freebsd-lib-9999-liblink.patch 2074 SHA256 e138b28fbf3a131231dfce1a111cc8ae2d6922bd47332a16bab4ae7d29bb628a SHA512 701657e5ae480cecc83a28c69b27791b7ac29c0d12ca518ffae8b05b377a2c2b6fdcfa72ccefdc502d85ac476046231cee2dca3baafb721b738f6bf6f724a0b9 WHIRLPOOL f95184614ebb77535943aa8c4db3e02a75a869c0d71574721768152d8dd9c4f60268f4b5f0e60db54e3422372f1b2dfaf977623c625e89c1186b9eab6afc6b97 |
80 |
AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb |
81 |
AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317 |
82 |
AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8 |
83 |
@@ -20,4 +21,4 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd |
84 |
AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae |
85 |
AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 |
86 |
EBUILD freebsd-lib-9.9999.ebuild 18177 SHA256 214e7ca1c8e7436a32786ef3df4f74e6cd159ef9265c7b8bf913cb9e27ce13a5 SHA512 8589bc21ce7a58f74f06d42111b42338f7ecc9eb0024079247a8e11761ec8dba40a867487ea9de24e71e7b7be595eba79194e80bab3c21ac5695efdd7cdc4deb WHIRLPOOL 0dd8a3381317a38aaf3bc1042e956518326cfd9c70cec6720a321e134ecb01147f2c045562d075e7754ee369c62abbbdd495244f9250fa01a763d80e61bab2b6 |
87 |
-EBUILD freebsd-lib-9999_p255023.ebuild 18177 SHA256 214e7ca1c8e7436a32786ef3df4f74e6cd159ef9265c7b8bf913cb9e27ce13a5 SHA512 8589bc21ce7a58f74f06d42111b42338f7ecc9eb0024079247a8e11761ec8dba40a867487ea9de24e71e7b7be595eba79194e80bab3c21ac5695efdd7cdc4deb WHIRLPOOL 0dd8a3381317a38aaf3bc1042e956518326cfd9c70cec6720a321e134ecb01147f2c045562d075e7754ee369c62abbbdd495244f9250fa01a763d80e61bab2b6 |
88 |
+EBUILD freebsd-lib-9999_p255023.ebuild 18301 SHA256 9591f1befa665bfa6ff1ebe94ebdb42877be0b290c295d2ff64ad74c940f77e3 SHA512 d71b655440351b1abaf3426c6736ac41ec8d01f4b4591d8f4bd6299c4c4d12ba6b9f8d61e4db3aa32aab4ecd5b0d40ac4a8c6f4cf3fbada29fe689fed5755a02 WHIRLPOOL bf8d1cd6af3cf20d6782489c7b508aaa50e9784610e68762168614b3c16822d253c1b63c6774abc8d610d35770e5cb8d9255f2f3c8aebf86af0f8af6b2f405d9 |
89 |
|
90 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild |
91 |
index 2271b2e..15d241d 100644 |
92 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild |
93 |
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild |
94 |
@@ -78,7 +78,7 @@ pkg_setup() { |
95 |
use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
96 |
use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
97 |
|
98 |
- mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= " |
99 |
+ mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_ATF= WITHOUT_LDNS= WITHOUT_ICONV= " |
100 |
|
101 |
if [ "${CTARGET}" != "${CHOST}" ]; then |
102 |
mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" |
103 |
@@ -89,9 +89,8 @@ pkg_setup() { |
104 |
PATCHES=( |
105 |
"${FILESDIR}/${PN}-6.0-pmc.patch" |
106 |
"${FILESDIR}/${PN}-6.1-csu.patch" |
107 |
- "${FILESDIR}/${PN}-9.2-liblink.patch" |
108 |
+ "${FILESDIR}/${PN}-9999-liblink.patch" |
109 |
"${FILESDIR}/${PN}-bsdxml2expat.patch" |
110 |
- "${FILESDIR}/${PN}-9.0-netware.patch" |
111 |
"${FILESDIR}/${PN}-9.0-bluetooth.patch" |
112 |
"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch" |
113 |
) |
114 |
@@ -192,6 +191,11 @@ src_prepare() { |
115 |
if use userland_GNU; then |
116 |
find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; |
117 |
fi |
118 |
+ |
119 |
+ # fix file collisions, dev-libs/libiconv-1.14:0::gentoo |
120 |
+ # /usr/include/iconv.h |
121 |
+ cd "${S}" |
122 |
+ rm include/iconv.h || die |
123 |
} |
124 |
|
125 |
bootstrap_lib() { |