Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Yuta SATOH <nigoro.gentoo@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-rescue/files/, sys-freebsd/freebsd-rescue/
Date: Mon, 30 Jul 2012 11:17:29
Message-Id: 1343647018.df004cbd7ef09f3415eac644919f42fae1436bd1.yuta_satoh@gentoo
1 commit: df004cbd7ef09f3415eac644919f42fae1436bd1
2 Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
3 AuthorDate: Mon Jul 30 11:16:58 2012 +0000
4 Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
5 CommitDate: Mon Jul 30 11:16:58 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=df004cbd
7
8 added freebsd-rescue-9.1_beta1.ebuild
9
10 ---
11 sys-freebsd/freebsd-rescue/Manifest | 14 +++++
12 .../files/freebsd-rescue-9.1-bsdtar.patch | 12 ++++
13 .../files/freebsd-rescue-9.1-libcleverlink.patch | 21 +++++++
14 .../freebsd-rescue/freebsd-rescue-9.1_beta1.ebuild | 62 ++++++++++++++++++++
15 4 files changed, 109 insertions(+), 0 deletions(-)
16
17 diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
18 index 63b283c..3a41a88 100644
19 --- a/sys-freebsd/freebsd-rescue/Manifest
20 +++ b/sys-freebsd/freebsd-rescue/Manifest
21 @@ -2,16 +2,30 @@ AUX freebsd-rescue-5.4-gentoo.patch 370 RMD160 450a06aa2e29146a4977021bef5b471c0
22 AUX freebsd-rescue-7.1-zlib.patch 800 RMD160 c0fe2406b5e6d5ab294f66a1c693e171787d2534 SHA1 8f45cf788e44d33af50e7e01b3b3685d17975374 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f
23 AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 RMD160 b222843091367815202d6616aa9863f3c8134bbb SHA1 542b73025d1d6e37f06dd1e825fd2efa099427ae SHA256 3690730ee66082fcc4f04ab79c49c6759772c0aefc68abdebbe4497b1155a7bc
24 AUX freebsd-rescue-8.2-libzcleverlink.patch 789 RMD160 e5a0ef150dc78021d6cea6a23500e13e76eb5a43 SHA1 0376be4a3d32f9fe2915e252e5de5faa9b658025 SHA256 80d86cb1b632d0c09fdcfd7b998fb1189e957619a41fc65682e2c439392c38fd
25 +AUX freebsd-rescue-9.1-bsdtar.patch 404 RMD160 08dbe45a6342becd798422d35f50c30ba66be93d SHA1 194d3886dd17a24881e40380056b195dee5cf7a1 SHA256 0e71e3e370b33318bbb167e82d6507589fb95cc2c2d1fc6e8b74d0faf3d17ef1
26 +AUX freebsd-rescue-9.1-libcleverlink.patch 801 RMD160 bdcf9b3217a84a9a850576072d3e053a242a5c9c SHA1 44cba5850d24c5165e0b43ec9ff5618eb22e1af6 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831
27 AUX freebsd-sbin-bsdxml2expat.patch 424 RMD160 a17cdeb5f6b663f369aa9bbf3857c903502f87f4 SHA1 fe5910e8319b2c5a5c623934381b298398370290 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287
28 DIST freebsd-bin-8.1.tar.bz2 417319 RMD160 faefbd01af0d26811e33bf056e5d619543bfe449 SHA1 6cfca01630aa65a4d68c3e2670c8b6c743ac0e94 SHA256 3f61adb8d9635817778d7a2133789af28468a2544dadba55210373e1ee1bff83
29 +DIST freebsd-bin-9.1_beta1.tar.bz2 389335 RMD160 466de2906842a3eca534f1434f1374f6ea67088f SHA1 6f568b64ea60b138900e02afa576c7cf09f65c5b SHA256 b66c53f5e64ed73fe40910d520c7b1d6350ffb33dbb38ae634eff3fc748f8adf
30 DIST freebsd-cddl-8.1.tar.bz2 772450 RMD160 6df59800acbbdce0edb050c89d7f653b6349180c SHA1 78a21fc3824a9269e916352883bf3f06498d22e9 SHA256 fba896c3a16ce29773b4df49522231f59aaad46fdadc02a3df102070cf1a1e4d
31 +DIST freebsd-cddl-9.1_beta1.tar.bz2 909633 RMD160 dca387e2c60d4a260c48c26f39d0142a42d788df SHA1 1eb086e5cabef08998d679608d35c353a9f815ac SHA256 59b09ef324c12b168e432d1fa297f12765bae9b81eeb08bd5e1ea79df4068ddc
32 DIST freebsd-contrib-8.1.tar.bz2 41505936 RMD160 68223ba655f944485c3ac69d9c06ed81bb88b1d1 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
33 +DIST freebsd-contrib-9.1_beta1.tar.bz2 54323262 RMD160 946c255f946a9d71011bea0eb488797370a14d1d SHA1 8337143138d6c32d887099d44a6eee178cc1c37b SHA256 e1bb740ea40ba56fc4829cd3543fb8a8efc798a82a63ab5ee8d322e036662604
34 DIST freebsd-gnu-8.1.tar.bz2 818430 RMD160 b37505495a485056826067d41ddfa1f44a56f2f9 SHA1 762be40e717cdb21f572865ae2dbad4055dc2439 SHA256 222e7341ec912832583cf364d9c19487ee763c1290d0f16549934e9fb0545064
35 +DIST freebsd-gnu-9.1_beta1.tar.bz2 803642 RMD160 386c44b5c52962b048cd712b4f2fc3b935c0052e SHA1 8e5e4e244576f0e6337801d112014b744dfce310 SHA256 1f4f8b69de8f53b139168a9f777b2b33ce0fc129726164da1c2ff9ac1a1aa1a8
36 DIST freebsd-lib-8.1.tar.bz2 3314868 RMD160 625d4b50400804a668247504a449b4949d7607d9 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
37 +DIST freebsd-lib-9.1_beta1.tar.bz2 3211722 RMD160 fb9e39be6153681a7a400ced82f7a87b48ec3785 SHA1 b183d7f475dbaf02f4ff41aa0c570a2cc18a47c5 SHA256 5fb3c002866f735fbaf600cadfb12e771528a479ec29bd99a51d1ace6975cf1e
38 DIST freebsd-libexec-8.1.tar.bz2 281958 RMD160 769659a61d15485fba22978e0c642b94d6f992f3 SHA1 4be5da6d0fee935df3731587bb967f0225c10b19 SHA256 fbd03c7b34bf294d6ce2a999d7dab1b6dffd07253b2242f2608a3cdb35720623
39 +DIST freebsd-libexec-9.1_beta1.tar.bz2 310339 RMD160 87230ec5ab8a1706265daf15a4f2ac779ade1015 SHA1 8fb5b538ac255a4511685ca09cccc85228ec5e41 SHA256 c492c4717a8305f824a7e4bc233b2ebcc9cfb68c288caa05d111015cf2bac011
40 DIST freebsd-rescue-8.1.tar.bz2 5051 RMD160 e94e1a99c11f3fd614efd417aa0584b4869c3f16 SHA1 90497235c4dde4b025633e75134e5bc238ab8f29 SHA256 030b3dc79608a10b66cbd05455a966f9518c957531a823fba39907cdf3acee83
41 +DIST freebsd-rescue-9.1_beta1.tar.bz2 3938 RMD160 db7e7c87bf429f772511dae20ee6e7aa64c3aee5 SHA1 a12e36dc4df8c51ae71361f793e09f23b68f957b SHA256 096a671e9353e21305933507eaa42bbeb1564b4b8ef24539144c1aad59c8ad3c
42 DIST freebsd-sbin-8.1.tar.bz2 1217639 RMD160 7e6facf4537f33d94a528019ca0e98127128b425 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
43 +DIST freebsd-sbin-9.1_beta1.tar.bz2 1274406 RMD160 af1ee94ade87170f3f24ff0300400e4beef95496 SHA1 ac4eee0dd738151495739f28528fdd1893e7fdb1 SHA256 bf0f0511806997041662a7439554faa212538a25eaedf1e2e3655dbf43661edd
44 DIST freebsd-sys-8.1.tar.bz2 24173113 RMD160 539ec5ddefb0bc6c20abe66dd406700e8fab1728 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
45 +DIST freebsd-sys-9.1_beta1.tar.bz2 32432638 RMD160 6f25992ee6cc1a0f99cf62168ecdb52b1fe39aa1 SHA1 e28773d0515b85275ba9e9205efac7a6cd5646fc SHA256 f992f5274b7f1e249a079493acf18a1c420cdd199cc45affc25f20b95e90bb29
46 DIST freebsd-ubin-8.1.tar.bz2 1807958 RMD160 526d26c6485770bf2d72a65d28eea2d33c12f5c1 SHA1 6bf37003a3f21f96d0ad7b577df9650aba66ff89 SHA256 85b416178d2ed356130a697450fbba665d4a1179f99e80b414317a07a08ff14d
47 +DIST freebsd-ubin-9.1_beta1.tar.bz2 1905480 RMD160 5b259860a37be8c54a4db027e03fe13e04d8257e SHA1 5bf045aff0343eb90bb0f71b4e2a5c56196cdd71 SHA256 15b71ef06eac072c7cf5c8dc58130e2f04aba84cdf8fa4168f39109f03d172a4
48 DIST freebsd-usbin-8.1.tar.bz2 2467364 RMD160 e71c8cde8357ddeff756d1d1f76b3decfc3c59d0 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
49 +DIST freebsd-usbin-9.1_beta1.tar.bz2 2681785 RMD160 36a913ee728ece476d5196eab65e72903d8ded10 SHA1 d823baf11d70cb9c29b77ae37b77ae2903f496e5 SHA256 f3eec62799b20678bb8a0b00f17505763d736c1d7d3656d0f7194295c523efc5
50 EBUILD freebsd-rescue-8.1.ebuild 1397 RMD160 fea350140b020add5fcd5b0422caff2dc6f379a0 SHA1 85b5c9e643898b4f41633b33892fdd0b860a546d SHA256 9c9ddcee2a7781f2c5227f2568b7f21c9c1d8da38cfd3c95193c8aa0610b4bb2
51 +EBUILD freebsd-rescue-9.1_beta1.ebuild 1793 RMD160 a9e74c778ef3216991f79dd03386e436f27bcfc3 SHA1 5f64abef386382f7ed80970c2cc5677ee091b543 SHA256 aa48730bebc8265ef076d4a8ee682ef8d920d3217ec3fb5428577b62cc75e098
52
53 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
54 new file mode 100644
55 index 0000000..d4d23d7
56 --- /dev/null
57 +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
58 @@ -0,0 +1,12 @@
59 +diff -Nur work.orig/contrib/libarchive/tar/bsdtar.c work/contrib/libarchive/tar/bsdtar.c
60 +--- work.orig/contrib/libarchive/tar/bsdtar.c 2012-07-12 13:44:29.000000000 +0900
61 ++++ work/contrib/libarchive/tar/bsdtar.c 2012-07-29 00:57:25.000000000 +0900
62 +@@ -691,7 +691,7 @@
63 + {
64 + printf("bsdtar %s - %s\n",
65 + BSDTAR_VERSION_STRING,
66 +- archive_version());
67 ++ archive_version_string());
68 + exit(0);
69 + }
70 +
71
72 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
73 new file mode 100644
74 index 0000000..a194397
75 --- /dev/null
76 +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
77 @@ -0,0 +1,21 @@
78 +diff -Nur work.orig/rescue/rescue/Makefile work/rescue/rescue/Makefile
79 +--- work.orig/rescue/rescue/Makefile 2012-07-29 00:50:20.000000000 +0900
80 ++++ work/rescue/rescue/Makefile 2012-07-29 00:56:01.000000000 +0900
81 +@@ -125,7 +125,7 @@
82 + .if ${MK_ZFS} != "no"
83 + CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem
84 + .endif
85 +-CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
86 ++CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lreadline -lsbuf -lufs
87 +
88 + .if ${MACHINE_CPUARCH} == "i386"
89 + CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
90 +@@ -216,7 +216,7 @@
91 + CRUNCH_PROGS_usr.sbin+= chown
92 + CRUNCH_ALIAS_chown= chgrp
93 + ##################################################################
94 +-CRUNCH_LIBS+= -lm
95 ++CRUNCH_LIBS+= -lmd -lz -lm
96 +
97 + .include <bsd.crunchgen.mk>
98 + .include <bsd.prog.mk>
99
100 diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_beta1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_beta1.ebuild
101 new file mode 100644
102 index 0000000..657f685
103 --- /dev/null
104 +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_beta1.ebuild
105 @@ -0,0 +1,62 @@
106 +# Copyright 1999-2012 Gentoo Foundation
107 +# Distributed under the terms of the GNU General Public License v2
108 +# $Header: $
109 +
110 +EAPI=2
111 +
112 +inherit bsdmk freebsd
113 +
114 +DESCRIPTION="FreeBSD's rescue binaries"
115 +SLOT="0"
116 +KEYWORDS="~amd64-fbsd ~x86-fbsd"
117 +LICENSE="BSD zfs? ( CDDL )"
118 +
119 +IUSE="atm netware nis zfs"
120 +
121 +SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
122 + mirror://gentoo/${CONTRIB}.tar.bz2
123 + mirror://gentoo/${LIB}.tar.bz2
124 + mirror://gentoo/${BIN}.tar.bz2
125 + mirror://gentoo/${SBIN}.tar.bz2
126 + mirror://gentoo/${USBIN}.tar.bz2
127 + mirror://gentoo/${GNU}.tar.bz2
128 + mirror://gentoo/${SYS}.tar.bz2
129 + mirror://gentoo/${LIBEXEC}.tar.bz2
130 + mirror://gentoo/${RESCUE}.tar.bz2
131 + zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
132 +
133 +RDEPEND=""
134 +DEPEND="sys-devel/flex
135 + >=app-arch/libarchive-2.7.1[static-libs]
136 + app-arch/xz-utils[static-libs]
137 + sys-libs/ncurses[static-libs]
138 + dev-libs/expat[static-libs]
139 + app-arch/bzip2[static-libs]
140 + dev-libs/libedit[static-libs]
141 + dev-libs/libxml2:2[static-libs]
142 + dev-libs/openssl[static-libs]
143 + sys-libs/zlib[static-libs]
144 + sys-libs/readline[static-libs]
145 + virtual/pkgconfig
146 + =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
147 + =sys-freebsd/freebsd-sources-${RV}*
148 + =sys-freebsd/freebsd-mk-defs-${RV}*"
149 +
150 +S="${WORKDIR}/rescue"
151 +
152 +pkg_setup() {
153 + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
154 + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
155 + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
156 + use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
157 +}
158 +
159 +src_prepare() {
160 + # As they are patches from ${WORKDIR} apply them by hand
161 + cd "${WORKDIR}"
162 + epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
163 + epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
164 + epatch "${FILESDIR}/${PN}"-9.1-libcleverlink.patch
165 + epatch "${FILESDIR}/${PN}"-9.1-bsdtar.patch
166 + epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
167 +}
Report Message
Find on MARC Find on Google Groups