From 92c1751d3fa067c8cd6643cf0cc63c8dfbd70fe5 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 17 Jan 2009 21:56:23 +0000 Subject: [PATCH] app-crypt/novell-nici: go back to old 2.7.4-0.02 version for x86 in multilib install --- .../app-crypt/novell-nici/ChangeLog | 4 ++ .../app-crypt/novell-nici/Manifest | 5 +- .../novell-nici/novell-nici-2.7.4.6.ebuild | 55 ++++++++++++------- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog index a605628..bfe7b6b 100644 --- a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog +++ b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Jan 2009; Mario Fetka + novell-nici-2.7.4.6.ebuild: + go back to old 2.7.4-0.02 version for x86 in multilib install + 16 Jan 2009; Mario Fetka +novell-nici-2.7.4.6.ebuild: Bump and use my rpm5 eclass diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest index 133f6ea..c813632 100644 --- a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest +++ b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest @@ -2,6 +2,7 @@ DIST Novell_Client_11.0-i386-20081003-CD1.iso 10033152 RMD160 fadcd5ad983fd7c7dc DIST Novell_Client_11.0-x86_64-20081003-CD1.iso 10487808 RMD160 8965da596c4e339ff2b5b8d240f91a478f9ca2d5 SHA1 acb2ef899c9c593e6f16b1226ed68f54e12f7214 SHA256 81c3153f9fa435ab7251694873c9b4083b126ebae544bd30527fb8183e690789 DIST Novell_Client_SLE11-i586-20081218-CD1.iso 8058880 RMD160 4a2a4146e82f0bb6f3f64e47f992fafcd20ce2e4 SHA1 e688c2571d90d5726928ff325e8da274f863d89f SHA256 7c3a6487879ae7846f3859e906e52811321b049667cbb04cb48fac079e6aee2e DIST Novell_Client_SLE11-x86_64-20081218-CD1.iso 8388608 RMD160 749d45b32a1317a8e48f5c4346ea235078bab721 SHA1 7bb062942005e1316539e8b97e961c8cbb0a0c2e SHA256 cc0be51b5f3c61bd071751c26c65fd3fc0a5cea495622bbce2e811973fa70d59 +DIST eDir_88_SP3_Linux.iso 108474368 RMD160 91a57fae04ded813e1907eb168b61e15a7745b92 SHA1 0512f75ab992aea0be72c38047dfa4cd7f0c4d45 SHA256 0d35135377e77924f3eab551beea7cd69639cc7843395dd95c4140d91ccda7ad DIST novell-client-2.0-SP1-sle10sp2-i386.iso 10100736 RMD160 dc9313c69a22359c9cdbb2f9105543d11a912381 SHA1 da0cfa59099a4de7d4bdc2a6390d8993c48ee00c SHA256 9c7edfcb67c6ea3a7c67c48568139b8c6dc369b106781320cf117cbda468ae70 DIST novell-client-2.0-SP1-sle10sp2-x86_64.iso 10971136 RMD160 2cf2b3c0b73b827ab4be0d74f87a9764c807c76b SHA1 91318ad4e643d2f43d47fd9fb234050d9ad62194 SHA256 789dc3bb04d8e7a7714001bce6af6ba8aba769ed32251e9cad53274322261028 DIST novell-client-2.0-sle10sp1-i386.iso 10866688 RMD160 b478e97de576987b0a3b801965dbddb4fc8d8ce0 SHA1 49d70ed6e7007b7e18468ec0b42bed6ac6b8702f SHA256 a6609aee78e90a5375fd698b571a015b3696d10ff2f11d085e4abf5b404a35d6 @@ -11,6 +12,6 @@ EBUILD novell-nici-2.7.2_p001.ebuild 1688 RMD160 9cb6e827fd8f65800e703286cb858db EBUILD novell-nici-2.7.3_p12.ebuild 3579 RMD160 ff8c0d7da8da1398b3836df7ddc14f13e2ad4a69 SHA1 1bcdd21d9f21b515bc90fd54d060cca9b89628b3 SHA256 351253f8e39fe023eb67889b4e7245ad03f26cf1a07588054e38c0b37fb2da96 EBUILD novell-nici-2.7.4.0.7.ebuild 3645 RMD160 c6cf146cd1e2ab11768157124785a31ee20a78c2 SHA1 b41c6409a49454c9cde204870e78c174635da11a SHA256 969b190b31e8fc84d2411d9a246522ad698b8ee39d20186444919e092ff6e40d EBUILD novell-nici-2.7.4.3.ebuild 3681 RMD160 459e2e657b9ca1d64284893c14390ca11c26e7d3 SHA1 0b9ac696d4f554c03a821f65c516a75161295764 SHA256 6d728f9d409954e1d772da5cd8437c7fba2594b5e1d4713150f3b0f2f1a98014 -EBUILD novell-nici-2.7.4.6.ebuild 3707 RMD160 eee45a0c6bdd1946eb63888fa75c4bf5a2362f31 SHA1 1d41e2408ea454ad5ab96c60fb36ea6fae21b79e SHA256 bf51f8f998d2cea2ebec4c5d92e1720b3c6ae158af797b516ef6e85f95bda773 -MISC ChangeLog 3058 RMD160 d29852172f39a0a0bbe9fec8444a5c3e138c470d SHA1 71b2470a558abce3cbfeb6d5c2ecf3cd0409fa38 SHA256 f8d408b336f80cee47d5e9d2be290a93eb205d48ae576f3a61dbaa9c10ed6092 +EBUILD novell-nici-2.7.4.6.ebuild 4153 RMD160 97c304ad6e5446c876cd6cbe4521bf1142a9a054 SHA1 d292e0db8d5905bf39371666dc071874e7a3cec1 SHA256 347051655463cc4599752c77522db2dea6364b689277fc63c66d344be2c5b4f7 +MISC ChangeLog 3204 RMD160 8e8a9abdf893a67078da3277d9a97824059fd870 SHA1 cc9a2e63b984e70d321938fc0c3565180375fe16 SHA256 055688af5b69caa3b13618af07a216a4ef65aa61dae1738c2a76d89af96d4c91 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.6.ebuild b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.6.ebuild index 9e1f784..2529d6d 100644 --- a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.6.ebuild +++ b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.6.ebuild @@ -5,6 +5,8 @@ NOVELL_BUILDID="CuRXfXSzq7M~" NOVELL_FILE32="Novell_Client_SLE11-i586-20081218-CD1.iso" NOVELL_FILE64="Novell_Client_SLE11-x86_64-20081218-CD1.iso" +NOVELL_BUILDID_1="SRO5fkNxGt8~" +NOVELL_FILE32_1="eDir_88_SP3_Linux.iso" RESTRICT="mirror strip" USE_RPMOFFSET_ONLY="1" @@ -15,13 +17,14 @@ MY_PV="${MY_PVV/_p/-}" DESCRIPTION="Novell NICI U.S./Worldwide (128bit) Crypto" HOMEPAGE="http://www.novell.com" -SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32} - amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} )" +SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32} ) + amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} ) + multilib? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID_1}/${NOVELL_FILE32_1} )" LICENSE="Novell-NCL" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="" +IUSE="multilib" DEPEND=">=app-arch/p7zip-4.15" @@ -36,8 +39,8 @@ src_unpack() { nlib=lib 7z x "${DISTDIR}"/${NOVELL_FILE32} - mkdir -p "${WORKDIR}"/${PN}-${MY_P} - cd ${PN}-${MY_P} + mkdir -p "${WORKDIR}"/${PN}-${PV} + cd ${PN}-${PV} rpm_unpack "${WORKDIR}"/suse/${narch}/nici-${MY_PV}.${narch}.rpm elif use amd64 then @@ -45,14 +48,19 @@ src_unpack() { nlib=lib64 7z x "${DISTDIR}"/${NOVELL_FILE64} - 7z x -y "${DISTDIR}"/${NOVELL_FILE32} - mkdir -p "${WORKDIR}"/${PN}-${MY_P} - cd ${PN}-${MY_P} + + if has_multilib_profile + then + 7z x -y "${DISTDIR}"/${NOVELL_FILE32_1} + fi + + mkdir -p "${WORKDIR}"/${PN}-${PV} + cd ${PN}-${PV} rpm_unpack "${WORKDIR}"/suse/${narch}/nici64-${MY_PV}.${narch}.rpm if has_multilib_profile then - rpm_unpack "${WORKDIR}"/suse/i586/nici-${MY_PV}.i586.rpm + rpm_unpack "${WORKDIR}"/setup/nici-2.7.4-0.02.i386.rpm fi fi @@ -65,41 +73,48 @@ src_install() { if use x86 then - dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/* + dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/${nlib}/* elif has_multilib_profile then - dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/* - ABI="x86" dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/lib/* + dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/${nlib}/* + ABI="x86" dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/lib/* ABI="x86" dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so else - dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/* + dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/${nlib}/* fi - doman "${WORKDIR}"/${PN}-${MY_P}/opt/novell/man/*/* + doman "${WORKDIR}"/${PN}-${PV}/opt/novell/man/*/* into /usr dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so insinto /etc/opt/novell/ - doins "${WORKDIR}"/${PN}-${MY_P}/etc/opt/novell/nici*.cfg + doins "${WORKDIR}"/${PN}-${PV}/etc/opt/novell/nici*.cfg if use x86 || has_multilib_profile then dosym opt/novell/nici.cfg /etc/nici.cfg +# ABI="x86" dosed "s$/opt/novell/lib$/opt/novell/$(get_libdir)$" /etc/opt/novell/nici.cfg + fi + + if has_multilib_profile + then + dosed "s|/opt/novell/lib|/opt/novell/lib32|" /etc/opt/novell/nici.cfg fi diropts -m777 dodir /var/opt/novell/nici exeinto /var/opt/novell/nici - doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/primenici* - doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicimud* - doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/set_server_mode* + doexe "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/primenici* + doexe "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/nicimud* + doexe "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/set_server_mode* insinto /var/opt/novell/nici - doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicifk.new - doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/xmgrcfg.wks + doins "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/nicifk.new + doins "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/xmgrcfg.wks dodir /var/novell dosym ../opt/novell/nici /var/novell/nici + } pkg_postinst() {