From 4ba2e961d0969d373f23e5b9ad4f0f69155b1f36 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 19 Dec 2009 06:41:59 +0000 Subject: [PATCH] net-nds/novell-novlsas: add multilib support --- .../net-nds/novell-novlsas/ChangeLog | 4 ++ .../net-nds/novell-novlsas/Manifest | 4 +- .../novell-novlsas-8.8.5.2.10.ebuild | 61 +++++++++++-------- 3 files changed, 43 insertions(+), 26 deletions(-) diff --git a/trunk/novell4gentoo/net-nds/novell-novlsas/ChangeLog b/trunk/novell4gentoo/net-nds/novell-novlsas/ChangeLog index 15ce617a..9938e105 100644 --- a/trunk/novell4gentoo/net-nds/novell-novlsas/ChangeLog +++ b/trunk/novell4gentoo/net-nds/novell-novlsas/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Dec 2009; Mario Fetka + novell-novlsas-8.8.5.2.10.ebuild: + add multilib support + 18 Dec 2009; Mario Fetka +novell-novlsas-8.8.5.2.10.ebuild: bump to 8.8 diff --git a/trunk/novell4gentoo/net-nds/novell-novlsas/Manifest b/trunk/novell4gentoo/net-nds/novell-novlsas/Manifest index 8cca7c2b..f8beb04b 100644 --- a/trunk/novell4gentoo/net-nds/novell-novlsas/Manifest +++ b/trunk/novell4gentoo/net-nds/novell-novlsas/Manifest @@ -1,6 +1,6 @@ DIST c1_136h-linux.tar.gz 41771356 RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 SHA1 de6525532a5b89b0872c129a54bb82e8f2e08aec SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b DIST edir885_Patch2.tar.gz 306609536 RMD160 4483666615f90ba16c6996e562c4dc182c3f6f6c SHA1 b9b8b9d3659b70738674f356f0691ab7545bc7c2 SHA256 12153f6a17d69bdf3fc968c067db9bcdd284b6910738ebbdde232f5e204c11bc EBUILD novell-novlsas-8.7.3.34.ebuild 1764 RMD160 02f0c6f36bbd63b824c5c9356a96489cce4c6eef SHA1 f5f17ef8e7ffea85035bcf3bb9d8a91de6ccf2e1 SHA256 62ed8dc9af1fc3da5faae8f6b9828938179b25b94bb02aaf387cbf36ff67caec -EBUILD novell-novlsas-8.8.5.2.10.ebuild 2422 RMD160 a7a2cf33cab4124520eab5903124b94ec142b80e SHA1 e2669faa0596b6a24001c29aafad64f0b9208b10 SHA256 48eeeedc1b07744c25249f996d2e77b9af30575c7bdb74a2baa73b28245946c0 -MISC ChangeLog 1790 RMD160 59fa083a8c075d22da9865015feecf3fb7aa4016 SHA1 96e755ce928c406be5bb2563b666a6f526f4d64b SHA256 36a636b3c6d9f9bc746f0b7ccb00dd9dd37b59d0bed6aef248ed8cf948acdf0e +EBUILD novell-novlsas-8.8.5.2.10.ebuild 2606 RMD160 cbe00c98acff4be6206113540c4deb407a1121bd SHA1 457db6baf890bf274996a77609774ea7ef2db422 SHA256 7b08ff931252979d6bbef1321f555b504de3db04b3705dc1d0a845fd8afbc0f9 +MISC ChangeLog 1901 RMD160 68d68172a8b2f89d34bec16c7c85dd36548fe291 SHA1 e517afdf31b0d5323c52da37a9795c2982f24766 SHA256 f53c35dc11d689bd96ed37807906c4621ace71a710bf2b31c720b6a4d69c16d7 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/net-nds/novell-novlsas/novell-novlsas-8.8.5.2.10.ebuild b/trunk/novell4gentoo/net-nds/novell-novlsas/novell-novlsas-8.8.5.2.10.ebuild index 5ff14da2..f744638f 100644 --- a/trunk/novell4gentoo/net-nds/novell-novlsas/novell-novlsas-8.8.5.2.10.ebuild +++ b/trunk/novell4gentoo/net-nds/novell-novlsas/novell-novlsas-8.8.5.2.10.ebuild @@ -4,8 +4,9 @@ EAPI="1" -NOVELL_BUILDID="T2wcCZC5kh4~" +NOVELL_BUILDID32="T2wcCZC5kh4~" NOVELL_FILE32="patchfiles/edir885_Patch2.tar.gz" +NOVELL_BUILDID64="T2wcCZC5kh4~" NOVELL_FILE64="patchfiles/edir885_Patch2.tar.gz" RESTRICT="mirror strip" @@ -15,13 +16,13 @@ MY_PV=$(replace_version_separator 4 '-') DESCRIPTION="Novell SAS Libraries" HOMEPAGE="http://www.novell.com" -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} )" +SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} ) + multilib? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )" LICENSE="Novell-eDir-88" SLOT="8.8" KEYWORDS="~x86 ~amd64" -IUSE="" +IUSE="multilib" DEPEND="!net-nds/novell-novlsas:0 !net-nds/novell-novlsas:8.7" @@ -32,22 +33,22 @@ RDEPEND="virtual/libc net-nds/novell-ndsbase:8.8" src_unpack() { - cd "${WORKDIR}" - unpack ${A} - if use x86 - then - narch=i586 - nlib=lib - ndir=Linux - elif use amd64 - then - narch=i586 - nlib=lib - ndir=Linux - fi - mkdir -p "${WORKDIR}"/${PN}-${MY_PV} - cd ${PN}-${MY_PV} - rpm_unpack ../work/edir8852/${ndir}/novell-NOVLsas.${narch}.rpm + cd "${WORKDIR}" + unpack ${A} + if use x86 + then + narch=i586 + nlib=lib + ndir=Linux + elif use amd64 + then + narch=i586 + nlib=lib + ndir=Linux + fi + mkdir -p "${WORKDIR}"/${PN}-${MY_PV} + cd ${PN}-${MY_PV} + rpm_unpack ../work/edir8852/${ndir}/novell-NOVLsas.${narch}.rpm } src_compile() { :; } @@ -63,10 +64,22 @@ src_install() { pkg_nofetch() { einfo "This files require you to register at ${HOMEPAGE} (free account)" - einfo "Please download following file:" - einfo " - ${NOVELL_FILE32}" - einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}" - einfo "and place it in ${DISTDIR}" + einfo "Please download following file(s):" + if use x86 + then + einfo " - ${NOVELL_FILE32}" + einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}" + elif use amd64 + then + einfo " - ${NOVELL_FILE64}" + einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID64}" + if use multilib + then + einfo " - ${NOVELL_FILE32}" + einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}" + fi + fi + einfo "and place them in ${DISTDIR}" einfo "" einfo "To get rid of downloading files from ${HOMEPAGE}" einfo "you can create a file /etc/portage/novell.acc"