From ea698bafe2f35316905768092eb6fa03cb424c84 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 19 Dec 2009 07:04:10 +0000 Subject: [PATCH] app-crypt/novell-npkiapi: add multilib support --- .../app-crypt/novell-npkiapi/ChangeLog | 5 ++ .../app-crypt/novell-npkiapi/Manifest | 6 +- ...novell-npkiapi-3.3.3.20090416_p0951.ebuild | 81 +++++++++++++------ ...novell-npkiapi-3.3.3.20090416_p0955.ebuild | 81 +++++++++++++------ 4 files changed, 118 insertions(+), 55 deletions(-) diff --git a/trunk/novell4gentoo/app-crypt/novell-npkiapi/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-npkiapi/ChangeLog index 616fe2cf..c0f4a7a8 100644 --- a/trunk/novell4gentoo/app-crypt/novell-npkiapi/ChangeLog +++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Dec 2009; Mario Fetka + novell-npkiapi-3.3.3.20090416_p0951.ebuild, + novell-npkiapi-3.3.3.20090416_p0955.ebuild: + add multilib support + 18 Dec 2009; Mario Fetka novell-npkiapi-3.3.3.20090416_p0951.ebuild, novell-npkiapi-3.3.3.20090416_p0955.ebuild: diff --git a/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest b/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest index 012c0f6e..93da9b49 100644 --- a/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest +++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest @@ -5,7 +5,7 @@ DIST ss206_SLAH.tgz 31143941 RMD160 6dbfa508a374c2b5139cc45214e9ad1a17919791 SHA EBUILD novell-npkiapi-3.3.0.1.20080710_p1008-r1.ebuild 1824 RMD160 13cd06c20cc79b28cb1136feda38b0962a0019f3 SHA1 868d4e51eb75d78d07bc7aa3ffeaab13495a81f2 SHA256 be01c504b6a73533f7f905021e4f86f2df523a3b11188009f40860061a6cea40 EBUILD novell-npkiapi-3.3.0.1.20080710_p1008-r2.ebuild 1933 RMD160 e8ae9ff2f3eee5d6d9361583302867014464146c SHA1 98be0534846a49fea5993798355f6729f790c968 SHA256 a0623c846296fa2c4d67cf6da6f619ebc4bbb5cc8032d8e15e44eb41ec5eec84 EBUILD novell-npkiapi-3.3.0.1.20080710_p1008.ebuild 1790 RMD160 a646c059584ba8acf9da40521f0403419aa96a4e SHA1 98fad7dfa3de34c7ff98c8db328e1fcad9d3374a SHA256 5e3628af925dd846c543c213f37bac839974638ca413aa8863452993c933f0b1 -EBUILD novell-npkiapi-3.3.3.20090416_p0951.ebuild 2526 RMD160 f532697c78b2382fe10aa262d108e73ab198a7c6 SHA1 7c7d9228736b03ebcf885a5ade41c46e5fd15d18 SHA256 9ca5db563c056c1d9085f61882f5a62a4d36125e5e5269ef5383b72e8feb7cfa -EBUILD novell-npkiapi-3.3.3.20090416_p0955.ebuild 2528 RMD160 4e3f95cbccb8f97bf899975cb4e6df06dcef1009 SHA1 90b6990169804b3de90f1112f2b1f95fdf54d7e4 SHA256 95cef5fbd7235829a1c2e1692709ac8eb9550c187ba4fe3431abd96cf95f3209 -MISC ChangeLog 2953 RMD160 6f237c20b2d62327469ca8a136e48afefbcba9e9 SHA1 f75315ccd803e875a51660a90d74e66577bfe154 SHA256 77ac6cc595633fdd774796a6791d96c2df388a8ac43ac68754571c479b38bd15 +EBUILD novell-npkiapi-3.3.3.20090416_p0951.ebuild 3288 RMD160 b92a2f403d0c15eb9ad030d1554be2f4b97ebb5a SHA1 a37eab1193353d9ad7e9e856b954c5c4a7b9532e SHA256 7fa21e4bc9193dfb61aff2dc21c190549bbf2d0e172d49d05534d8b608300bda +EBUILD novell-npkiapi-3.3.3.20090416_p0955.ebuild 3290 RMD160 bb29d344406bbdc042a62e6cd3e5442026742c8b SHA1 0ee52c3e26076761efe05b78082207284b8f65a5 SHA256 edb994ecf611c566414a26a2c34f2705aeecec9e7593413026efb9b70ce9ac83 +MISC ChangeLog 3120 RMD160 ddc716c7cae10aa3b9c0cc34daa212d5990e4e84 SHA1 b3a64a113b5af9730db0e573f2f526b1ea5315ce SHA256 eeda971eb4bad93e6976ce21bb0b3369233ecb98e793f79d0bdd33b07b248b3b MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0951.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0951.ebuild index 36811e49..7f982e1a 100644 --- a/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0951.ebuild +++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0951.ebuild @@ -6,7 +6,7 @@ EAPI="1" NOVELL_BUILDID32="63eV_vS9dv4~" NOVELL_FILE32="eDirectory_88SP5_Linux_i586.tar.gz" -NOVELL_BUILDID64="ffdH4AJgrFs~" +NOVELL_BUILDID64="ffdH4AJgrFs~" NOVELL_FILE64="eDirectory_88SP5_Linux_x86_64.tar.gz" RESTRICT="mirror strip" @@ -18,12 +18,13 @@ MY_PV="${MY_PVV/_p/_}" DESCRIPTION="Novell Public Key Infrastructure Services" HOMEPAGE="http://www.novell.com" SRC_URI="x86? ( 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} )" + 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" -IUSE="" +IUSE="multilib" DEPEND="!app-crypt/novell-npkiapi:0 !app-crypt/novell-npkiapi:8.7" @@ -38,40 +39,69 @@ 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=x86_64 - nlib=lib64 - ndir=Linux64 - fi - mkdir -p "${WORKDIR}"/${PN}-${MY_PV} - cd ${PN}-${MY_PV} - rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm + cd "${WORKDIR}" + unpack ${A} + if use x86 + then + narch=i386 + 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=i386 + mlib=lib + mdir=Linux + rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV/_*/_0951}.${march}.rpm + fi + rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm } src_compile() { :; } src_install() { - into /opt/novell - dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/* + into /opt/novell + dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/* + if has_multilib_profile + then + ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${mlib}/*.* + fi into /usr java-pkg_jarinto /opt/novell/$(get_libdir) java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*.jar + if has_multilib_profile + then + ABI="x86" dlib="$(get_libdir)" + java-pkg_jarinto /opt/novell/${dlib} + java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${mlib}/*.jar + fi } 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" @@ -79,4 +109,3 @@ pkg_nofetch() { einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc" einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc" } - diff --git a/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0955.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0955.ebuild index 1adf4f38..c6cefb41 100644 --- a/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0955.ebuild +++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0955.ebuild @@ -6,7 +6,7 @@ EAPI="1" NOVELL_BUILDID32="63eV_vS9dv4~" NOVELL_FILE32="eDirectory_88SP5_Linux_i586.tar.gz" -NOVELL_BUILDID64="ffdH4AJgrFs~" +NOVELL_BUILDID64="ffdH4AJgrFs~" NOVELL_FILE64="eDirectory_88SP5_Linux_x86_64.tar.gz" RESTRICT="mirror strip" @@ -18,12 +18,13 @@ MY_PV="${MY_PVV/_p/_}" DESCRIPTION="Novell Public Key Infrastructure Services" HOMEPAGE="http://www.novell.com" SRC_URI="x86? ( 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} )" + 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="~amd64" -IUSE="" +IUSE="multilib" DEPEND="!app-crypt/novell-npkiapi:0 !app-crypt/novell-npkiapi:8.7" @@ -38,40 +39,69 @@ 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=x86_64 - nlib=lib64 - ndir=Linux64 - fi - mkdir -p "${WORKDIR}"/${PN}-${MY_PV} - cd ${PN}-${MY_PV} - rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm + cd "${WORKDIR}" + unpack ${A} + if use x86 + then + narch=i386 + 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=i386 + mlib=lib + mdir=Linux + rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV/_*/_0951}.${march}.rpm + fi + rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm } src_compile() { :; } src_install() { - into /opt/novell - dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/* + into /opt/novell + dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/* + if has_multilib_profile + then + ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${mlib}/*.* + fi into /usr java-pkg_jarinto /opt/novell/$(get_libdir) java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*.jar + if has_multilib_profile + then + ABI="x86" dlib="$(get_libdir)" + java-pkg_jarinto /opt/novell/${dlib} + java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${mlib}/*.jar + fi } 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" @@ -79,4 +109,3 @@ pkg_nofetch() { einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc" einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc" } -