diff --git a/trunk/novell4gentoo/net-nds/novell-novlice/ChangeLog b/trunk/novell4gentoo/net-nds/novell-novlice/ChangeLog index a8d57eb..c63c788 100644 --- a/trunk/novell4gentoo/net-nds/novell-novlice/ChangeLog +++ b/trunk/novell4gentoo/net-nds/novell-novlice/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Dec 2009; Mario Fetka + novell-novlice-8.8.5.2.9.ebuild: + add multilib support + 18 Dec 2009; Mario Fetka +novell-novlice-8.8.5.2.9.ebuild: bump to 8.8 diff --git a/trunk/novell4gentoo/net-nds/novell-novlice/Manifest b/trunk/novell4gentoo/net-nds/novell-novlice/Manifest index d540b8a..4e2fad9 100644 --- a/trunk/novell4gentoo/net-nds/novell-novlice/Manifest +++ b/trunk/novell4gentoo/net-nds/novell-novlice/Manifest @@ -1,6 +1,6 @@ DIST edir87310_ftf2.tar.gz 254893129 RMD160 5db2ec018ecf7de9f3eb1e5a8ba8022e99f8cce2 SHA1 9fabfdfd807428c760942fdf49fc35b55a4b4e9a SHA256 36c657623419edb2e43b14943785d24f3d1872b4ecf5d6fc97a35792a8db3ba7 DIST edir885_Patch2.tar.gz 306609536 RMD160 4483666615f90ba16c6996e562c4dc182c3f6f6c SHA1 b9b8b9d3659b70738674f356f0691ab7545bc7c2 SHA256 12153f6a17d69bdf3fc968c067db9bcdd284b6910738ebbdde232f5e204c11bc EBUILD novell-novlice-8.7.3.9.2.ebuild 2027 RMD160 94b5cd1c6d0c446b3b7be0c90d012d3439a7e484 SHA1 eaee7288ce1e96c3780c758ddc6a538ce3d5eada SHA256 d19cd01cffa0d621f02d50627d663366ee44ae847883098329d6c71e2f4ae0c3 -EBUILD novell-novlice-8.8.5.2.9.ebuild 2936 RMD160 904c93595d33004d56062e4fc379ba2fd73c6c90 SHA1 e08c007762c11bc3b8e1bcb778ece5d2984a78fc SHA256 2cddd910463ec40f0e87664ab1c0d55c7493c291579a6f315797b08b32853b01 -MISC ChangeLog 2146 RMD160 a8a51d570100f6f9db0363e21f5d39b99f4d1d3d SHA1 e250bc41fffa136202926587233926eff8fccdf4 SHA256 c948e5342e7bd7c8a3268ea13e017215df291ed5e3750f67bd3fb208adc77046 +EBUILD novell-novlice-8.8.5.2.9.ebuild 3397 RMD160 f43a802bb730139eec480e7f5016f363b28280c0 SHA1 158c9064ce6c332be1f6e7c64dd7f93c4ad5c714 SHA256 5b88ce0b5b52b480a9be97551d7551e08f130ef7aa9235b7665747afbdcb32b8 +MISC ChangeLog 2256 RMD160 203347465eb41844f098f92bf7ee0d1c0940c666 SHA1 faa210a4c7b235d4cf57cadb47658a8c60fdefb6 SHA256 d7c6cc83ca9329d066187947c44fdbeadcfa02e28473a392ebb8d329f4168a70 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/net-nds/novell-novlice/novell-novlice-8.8.5.2.9.ebuild b/trunk/novell4gentoo/net-nds/novell-novlice/novell-novlice-8.8.5.2.9.ebuild index 80272a3..7e59fc1 100644 --- a/trunk/novell4gentoo/net-nds/novell-novlice/novell-novlice-8.8.5.2.9.ebuild +++ b/trunk/novell4gentoo/net-nds/novell-novlice/novell-novlice-8.8.5.2.9.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,14 @@ MY_PV=$(replace_version_separator 4 '-') DESCRIPTION="Novell eDirectory ICE Utilities" 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_BUILDID32}/${NOVELL_FILE32} ) + amd64? ( 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="linguas_fr" +IUSE="linguas_fr linguas_ja multilib" DEPEND="!net-nds/novell-novlice:0 !net-nds/novell-novlice:8.7" @@ -33,48 +35,68 @@ RDEPEND="virtual/libc net-nds/novell-novlxis:8.8" src_unpack() { - cd "${WORKDIR}" - unpack ${A} - if use x86 - then - narch=i586 - nlib=lib - ndir=Linux - elif use amd64 - then - narch=x86_64 - nlib=lib64 - ndir=Linux64 - fi - mkdir -p "${WORKDIR}"/${PN}-${MY_PV} - cd ${PN}-${MY_PV} - rpm_unpack ../work/edir8852/${ndir}/novell-NOVLice.${narch}.rpm -} + cd "${WORKDIR}" + unpack ${A} + if use x86 + then + narch=i586 + nlib=lib + ndir=Linux + elif use amd64 + then + narch=x86_64 + nlib=lib64 + ndir=Linux64 + fi + mkdir -p "${WORKDIR}"/${PN}-${MY_PV} + cd ${PN}-${MY_PV} + if has_multilib_profile + then + march=i586 + mlib=lib + mdir=Linux + rpm_unpack ../work/edir8852/${mdir}/novell-NOVLice.${march}.rpm + fi + rpm_unpack ../work/edir8852/${ndir}/novell-NOVLice.${narch}.rpm +} src_compile() { :; } src_install() { - into /opt/novell/eDirectory/ - dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/bin/* - dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.* - - insinto /etc/opt/novell/eDirectory/conf - doins "${WORKDIR}"/${PN}-${MY_PV}/etc/opt/novell/eDirectory/conf/*.* - - insinto /opt/novell/eDirectory/res - doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/res/* - - doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*.gz - use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/fr/*/*.gz - use linguas_ja && doman -i18n=ja "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/ja/*/*.gz + into /opt/novell/eDirectory/ + dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/bin/* + dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.* + if has_multilib_profile + then + ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${mlib}/*.so* + fi + insinto /etc/opt/novell/eDirectory/conf + doins "${WORKDIR}"/${PN}-${MY_PV}/etc/opt/novell/eDirectory/conf/*.* + insinto /opt/novell/eDirectory/res + doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/res/* + doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*.gz + use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/fr/*/*.gz + use linguas_ja && doman -i18n=ja "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/ja/*/*.gz } 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"