Gentoo Archives: gentoo-commits

From: Wiktor W Brodlo <wiktor@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/anaconda-overlay:master commit in: app-admin/anaconda/
Date: Tue, 05 Jul 2011 19:55:59
Message-Id: 5a2072dc485a57d4afda41b2231d0f65a53cc931.wiktor@gentoo
1 commit: 5a2072dc485a57d4afda41b2231d0f65a53cc931
2 Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
3 AuthorDate: Tue Jul 5 19:55:12 2011 +0000
4 Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
5 CommitDate: Tue Jul 5 19:55:12 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda-overlay.git;a=commit;h=5a2072dc
7
8 Removed sabayon anaconda-0.9.9.55
9
10 ---
11 app-admin/anaconda/Manifest | 2 -
12 app-admin/anaconda/anaconda-0.9.9.55.ebuild | 216 ---------------------------
13 2 files changed, 0 insertions(+), 218 deletions(-)
14
15 diff --git a/app-admin/anaconda/Manifest b/app-admin/anaconda/Manifest
16 index dc6cb57..a4b3667 100644
17 --- a/app-admin/anaconda/Manifest
18 +++ b/app-admin/anaconda/Manifest
19 @@ -3,8 +3,6 @@ AUX compat.py 461 RMD160 ae776a51f27564321845126c39874eab953a41cd SHA1 229eea09e
20 AUX libselinux-glibc-fix.patch 277 RMD160 212f7e529fabb3bb0a00b262a7d0dbf8895281f5 SHA1 e6982a27d284f214b859364d76fa7e8cd0fd8fe7 SHA256 add3156bb12439a48fb7166bf25ef7b51f53c8a750813546f33fe5d54c9645cb
21 AUX liveinst 40 RMD160 39595adfb6c90dcf5b30d1ebdd7f0fac224d6d16 SHA1 4ec5b3c634341ca1e856fbffe69a61236f8335af SHA256 32721c6398f6b7e77e45ed5cbbe32c15b9b2ae424311ae4fe77d95c2b17a8af3
22 AUX make_liveinst_update_package.sh 653 RMD160 0c7e88651d03d25210ca36500e28e0bc2caa7172 SHA1 abf190bf40d5d8b0ddd0ff99a69c5096b47c949b SHA256 cfec6af92438e670dbc3341519e65a6847640003708a07e6d78aca187d307d2c
23 -DIST anaconda-0.9.9.55.tar.bz2 13343746 RMD160 dbe9ae841f496f6d7ecd3ba5c81073441f62a12b SHA1 9dcdfbee35c96ef06eec620297fc2486c003a1f3 SHA256 2e97082ca36e9a042eee2fe4303a6790c60880658b84b49709399c08cc8fbc36
24 DIST audit-1.7.9.tar.gz 1245155 RMD160 248ca395c6d58dccf8437750e6cf5a7040a28c9f SHA1 aa7de4546f4774338946987fe1a8231222475e64 SHA256 95ce67d9aee4339a5aa11214f21dfa5f37c5820e2511c7bddf998d26b1aaefc9
25 DIST libselinux-2.0.85.tar.gz 175396 RMD160 ce27fc9c5baf23d9f1c2eeda24357abc4d619d48 SHA1 b2e29934f3cde0a2fb86fe29c8cc1abac8c7e9ca SHA256 54db845fbaa2b3183798e6754b11e4178802f9eae47569b391d87a45b8a69c3c
26 -EBUILD anaconda-0.9.9.55.ebuild 6702 RMD160 a0d41052690730e5b0222c0224af20118e762b69 SHA1 48760f2641e63e8743081818ba988617fb893f4a SHA256 bee46a595e7557eb6a50107715635c7a5a34eef791a88666557b7235f6cb35ef
27 EBUILD anaconda-9999.ebuild 6602 RMD160 cbe495efc5351753ecd69f4fdca1d4a066c51be3 SHA1 50e7abc7f1f5b828f73b5448ec43c27d1a744e50 SHA256 23e7f28070028d1c19ea628e33948f9557384ada7b3307e04c3bfc50b01108bf
28
29 diff --git a/app-admin/anaconda/anaconda-0.9.9.55.ebuild b/app-admin/anaconda/anaconda-0.9.9.55.ebuild
30 deleted file mode 100644
31 index 1bd32be..0000000
32 --- a/app-admin/anaconda/anaconda-0.9.9.55.ebuild
33 +++ /dev/null
34 @@ -1,216 +0,0 @@
35 -# Copyright 2004-2010 Sabayon
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Header: $
38 -
39 -EAPI="2"
40 -
41 -if [ "${PV}" = "9999" ]; then
42 - EGIT_COMMIT="master"
43 - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/anaconda.git"
44 - MY_ECLASS="git"
45 -fi
46 -inherit flag-o-matic base python libtool autotools eutils ${MY_ECLASS}
47 -
48 -AUDIT_VER="1.7.9"
49 -AUDIT_SRC_URI="http://people.redhat.com/sgrubb/audit/audit-${AUDIT_VER}.tar.gz"
50 -
51 -SEPOL_VER="2.0"
52 -LSELINUX_VER="2.0.85"
53 -LSELINUX_SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/libselinux-${LSELINUX_VER}.tar.gz"
54 -
55 -DESCRIPTION="Gentoo Redhat Anaconda Installer Port"
56 -HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=summary"
57 -if [ "${PV}" = "9999" ]; then
58 - SRC_URI="${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}"
59 - KEYWORDS=""
60 -else
61 - SRC_URI="http://distfiles.sabayon.org/${CATEGORY}/${PN}-${PVR}.tar.bz2 ${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}"
62 - KEYWORDS="~amd64 ~x86"
63 -fi
64 -S="${WORKDIR}"/${PN}-${PVR}
65 -AUDIT_S="${WORKDIR}/audit-${AUDIT_VER}"
66 -LSELINUX_S="${WORKDIR}/libselinux-${LSELINUX_VER}"
67 -
68 -LICENSE="GPL-2 public-domain"
69 -SLOT="0"
70 -IUSE="+ipv6 +nfs ldap"
71 -
72 -AUDIT_DEPEND="dev-lang/swig"
73 -AUDIT_RDEPEND="ldap? ( net-nds/openldap )"
74 -LSELINUX_DEPEND="=sys-libs/libsepol-${SEPOL_VER}* dev-lang/swig"
75 -LSELINUX_RDEPEND="=sys-libs/libsepol-${SEPOL_VER}*"
76 -LSELINUX_CONFLICT="!sys-libs/libselinux" # due to pythonX.Y/site-packages+/usr/sbin not being handled
77 -COMMON_DEPEND="app-admin/system-config-keyboard
78 - >=app-arch/libarchive-2.8
79 - app-cdr/isomd5sum
80 - dev-libs/newt
81 - nfs? ( net-fs/nfs-utils )
82 - sys-fs/lvm2
83 - =sys-block/open-iscsi-2.0.870.3-r1"
84 -DEPEND="${COMMON_DEPEND} ${AUDIT_DEPEND} ${LSELINUX_DEPEND} sys-apps/sed"
85 -RDEPEND="${COMMON_DEPEND} ${AUDIT_RDEPEND}
86 - ${LSELINUX_RDEPEND} ${LSELINUX_CONFLICT}
87 - app-misc/anaconda-runtime
88 - app-misc/anaconda-runtime-gui"
89 -
90 -src_unpack() {
91 - if [ "${PV}" = "9999" ]; then
92 - git_src_unpack
93 - base_src_unpack
94 - else
95 - base_src_unpack
96 - fi
97 - # Patch the internal libs to fix new glibc incompatibility
98 - epatch "${FILESDIR}/audit-glibc-fix.patch"
99 - epatch "${FILESDIR}/libselinux-glibc-fix.patch"
100 -}
101 -
102 -src_prepare() {
103 -
104 - # Setup CFLAGS, LDFLAGS
105 - append-cflags "-I${D}/usr/include/anaconda-runtime"
106 - append-ldflags "-L${D}/usr/$(get_libdir)/anaconda-runtime"
107 -
108 - # Setup anaconda
109 - cd "${S}"
110 - ./autogen.sh || die "cannot run autogen"
111 -
112 - ##
113 - ## Setup libaudit
114 - ##
115 - cd "${AUDIT_S}"
116 - # Do not build GUI tools
117 - sed -i \
118 - -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
119 - "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac"
120 - sed -i \
121 - -e 's,system-config-audit,,g' \
122 - -e '/^SUBDIRS/s,\\$,,g' \
123 - "${AUDIT_S}"/Makefile.am || die "cannot sed libaudit Makefile.am"
124 - rm -rf "${AUDIT_S}"/system-config-audit
125 -
126 - if ! use ldap; then
127 - sed -i \
128 - -e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
129 - "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac (ldap)"
130 - sed -i \
131 - -e '/^SUBDIRS/s,zos-remote,,g' \
132 - "${AUDIT_S}"/audisp/plugins/Makefile.am || die "cannot sed libaudit Makefile.am (ldap)"
133 - fi
134 - eautoreconf
135 -
136 -}
137 -
138 -copy_audit_data_over() {
139 - dodir "/usr/$(get_libdir)/anaconda-runtime"
140 - cp -Ra "${AUDIT_S}/fakeroot/usr/$(get_libdir)/anaconda-runtime/"* \
141 - "${D}/usr/$(get_libdir)/anaconda-runtime" || die "cannot cp audit data"
142 - dodir "/usr/include/anaconda-runtime"
143 - cp -Ra "${AUDIT_S}/fakeroot/usr/include/anaconda-runtime/"* \
144 - "${D}/usr/include/anaconda-runtime" || die "cannot cp audit include data"
145 -}
146 -
147 -src_configure() {
148 - # configure audit
149 - cd "${AUDIT_S}"
150 - einfo "configuring audit"
151 - econf --sbindir=/sbin --libdir=/usr/$(get_libdir)/anaconda-runtime \
152 - --includedir=/usr/include/anaconda-runtime \
153 - --without-prelude || die
154 -
155 - # compiling audit here, anaconda configure needs libaudit
156 - einfo "compiling audit"
157 - cd "${AUDIT_S}" || die "cannot cd into ${AUDIT_S}"
158 - base_src_compile
159 -
160 - # installing audit
161 - einfo "installing audit libs into ${AUDIT_S}/fakeroot temporarily"
162 - cd "${AUDIT_S}" || die "cannot cd into ${AUDIT_S}"
163 - ( rm -rf fakeroot && mkdir fakeroot ) || die "cannot mkdir"
164 - emake DESTDIR="${AUDIT_S}/fakeroot" install || die "cannot install libaudit"
165 - copy_audit_data_over # for proper linking
166 -
167 - # configure anaconda
168 - cd "${S}"
169 - einfo "configuring anaconda"
170 - econf \
171 - $(use_enable ipv6) $(use_enable selinux) \
172 - $(use_enable nfs) || die "configure failed"
173 -}
174 -
175 -src_compile() {
176 -
177 - cd "${S}"
178 - base_src_compile
179 -
180 - # compiling libselinux
181 - einfo "compiling libselinux"
182 - cd "${LSELINUX_S}" || die "cannot cd into ${LSELINUX_S}"
183 - LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \
184 - emake \
185 - LDFLAGS="-fPIC ${LDFLAGS}" \
186 - PYLIBVER="python$(python_get_version)" \
187 - PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \
188 - SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \
189 - INCLUDEDIR="${D}/usr/include/anaconda-runtime" \
190 - all || die
191 - LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \
192 - emake \
193 - LDFLAGS="-fPIC ${LDFLAGS}" \
194 - PYLIBVER="python$(python_get_version)" \
195 - PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \
196 - SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \
197 - INCLUDEDIR="${D}/usr/include/anaconda-runtime" \
198 - pywrap || die
199 -
200 - # add compatibility aliases to swig wrapper
201 - cat "${FILESDIR}/compat.py" >> "${LSELINUX_S}/src/selinux.py" || die
202 -
203 -}
204 -
205 -src_install() {
206 -
207 - # installing libselinux
208 - cd "${LSELINUX_S}"
209 - python_need_rebuild
210 - LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \
211 - emake DESTDIR="${D}" \
212 - PYLIBVER="python$(python_get_version)" \
213 - PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \
214 - LIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \
215 - SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \
216 - INCLUDEDIR="${D}/usr/include/anaconda-runtime" \
217 - install install-pywrap || die
218 -
219 - # fix libselinux.so link
220 - dosym libselinux.so.1 /usr/$(get_libdir)/anaconda-runtime/libselinux.so
221 - # LD_RUN_PATH works with ld >=2.20, so /etc/env.d/99anaconda for now
222 - # will be dropped in future
223 - echo "LDPATH=\"/usr/$(get_libdir)/anaconda-runtime\"" > 99anaconda
224 - doenvd 99anaconda
225 -
226 - cd "${S}"
227 - copy_audit_data_over # ${D} is cleared
228 - base_src_install
229 -
230 - # install liveinst for user
231 - dodir /usr/bin
232 - exeinto /usr/bin
233 - doexe "${FILESDIR}"/liveinst
234 - dosym /usr/bin/liveinst /usr/bin/installer
235 -
236 - # drop .la files for God sake
237 - find "${D}" -name "*.la" | xargs rm
238 -
239 - # Cleanup .pyc .pyo
240 - find "${D}" -name "*.py[co]" -type f -delete
241 -
242 -}
243 -
244 -pkg_postrm() {
245 - python_mod_cleanup $(python_get_sitedir)/py${PN}
246 -}
247 -
248 -pkg_postinst() {
249 - python_mod_optimize $(python_get_sitedir)/py${PN}
250 -}