From 6dd29ec91c9d230e336235e5ce628a72bf1eaca1 Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 18 Dec 2009 19:41:20 +0000 Subject: [PATCH] net-nds/novell-ndsbase: add multilib support --- .../net-nds/novell-ndsbase/ChangeLog | 4 + .../net-nds/novell-ndsbase/Manifest | 4 +- .../novell-ndsbase-8.8.5.2.9.ebuild | 76 +++++++++++++------ 3 files changed, 59 insertions(+), 25 deletions(-) diff --git a/trunk/novell4gentoo/net-nds/novell-ndsbase/ChangeLog b/trunk/novell4gentoo/net-nds/novell-ndsbase/ChangeLog index 0fc9b7ff..06b1a830 100644 --- a/trunk/novell4gentoo/net-nds/novell-ndsbase/ChangeLog +++ b/trunk/novell4gentoo/net-nds/novell-ndsbase/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 Dec 2009; Mario Fetka + novell-ndsbase-8.8.5.2.9.ebuild: + add multilib support + 18 Dec 2009; Mario Fetka novell-ndsbase-8.8.5.2.9.ebuild: correct jar install in wrong location diff --git a/trunk/novell4gentoo/net-nds/novell-ndsbase/Manifest b/trunk/novell4gentoo/net-nds/novell-ndsbase/Manifest index 4fbd9f6f..38b6355a 100644 --- a/trunk/novell4gentoo/net-nds/novell-ndsbase/Manifest +++ b/trunk/novell4gentoo/net-nds/novell-ndsbase/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-ndsbase-8.7.3.10.90.ebuild 2565 RMD160 2bd7d23f0d4a3cf088c88e1daab5ba3ce8ff0832 SHA1 8438b9daa3dc85efaf9b5d752af4da9599a77765 SHA256 0de45b48eac99be18caa23424db930fae65b884d493561f1823feb5c262c1ca4 -EBUILD novell-ndsbase-8.8.5.2.9.ebuild 3163 RMD160 b6c2a0fb10edfa8641385c6a40316180757d41ad SHA1 64c29b6740f098dddf22a43f6b642e1eb1876ba3 SHA256 0cc3a7828da6f8e12232f125d57cc5c1a45026109fea2195262f7d95dbd55002 -MISC ChangeLog 2962 RMD160 65ff7fa065aeb9c95eb3c94a8943e2c13cb93c22 SHA1 5c82cdb0230636cc2cf48331e6b1bdbc6d26f783 SHA256 eca4dd4d44ee0d5be33fac03712803667ee274aff4193332fd6c1f19f0cacdaf +EBUILD novell-ndsbase-8.8.5.2.9.ebuild 4012 RMD160 7607e39f84890902ddfbf0ae9840da386a7e8f32 SHA1 8b6099969c17f12b40d5bcdbab0175e1b8e6e09f SHA256 9c07528dbbca7f60e3b182ba177910ad587e3efa125caace67202fd23f894a09 +MISC ChangeLog 3072 RMD160 d54555514a6f00d6886b9dcfed83825a143b87f2 SHA1 cbbdf4ddd5efde552cae374859e98656ac075380 SHA256 03827d4e18014fb9ce62f5028e9baa6efb532827f2d09835ec22c487134b34db MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/net-nds/novell-ndsbase/novell-ndsbase-8.8.5.2.9.ebuild b/trunk/novell4gentoo/net-nds/novell-ndsbase/novell-ndsbase-8.8.5.2.9.ebuild index cf8cb3cc..02c0234c 100644 --- a/trunk/novell4gentoo/net-nds/novell-ndsbase/novell-ndsbase-8.8.5.2.9.ebuild +++ b/trunk/novell4gentoo/net-nds/novell-ndsbase/novell-ndsbase-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,8 +16,9 @@ MY_PV=$(replace_version_separator 4 '-') DESCRIPTION="Novell Directory User Agent" 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" @@ -32,22 +34,29 @@ RDEPEND="virtual/libc net-nds/novell-edir-env" 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-NDSbase.${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-NDSbase.${march}.rpm + fi + rpm_unpack ../work/edir8852/${ndir}/novell-NDSbase.${narch}.rpm } src_compile() { :; } @@ -66,9 +75,18 @@ src_install() { use unicode && doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/share/locale/fr_FR.UTF-8/LC_MESSAGES/*.mo dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/bin/* dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.so* + if has_multilib_profile + then + ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${mlib}/*.so* + fi into /usr java-pkg_jarinto /opt/novell/eDirectory/$(get_libdir) java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.jar + if has_multilib_profile + then + ABI="x86" java-pkg_jarinto /opt/novell/eDirectory/$(get_libdir) + ABI="x86" java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${mlib}/*.jar + fi 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 @@ -77,10 +95,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"