diff --git a/trunk/novell4gentoo/net-nds/novell-audtedirinst/Manifest b/trunk/novell4gentoo/net-nds/novell-audtedirinst/Manifest index 94fc4513..1b47e44d 100644 --- a/trunk/novell4gentoo/net-nds/novell-audtedirinst/Manifest +++ b/trunk/novell4gentoo/net-nds/novell-audtedirinst/Manifest @@ -1,6 +1,3 @@ -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-ndsmasv-8.7.3.10.2.ebuild 1882 RMD160 167b296e25f64d3281c3e9e29e93b1a38e42c56f SHA1 254a0d653a657b9fbd92b5a74d4a9ea36ac4faf2 SHA256 711e0bd5728fa083dc47ece4b63e0ee03b1c9f298fbe5e35d44dd29915b52df8 -EBUILD novell-ndsmasv-8.8.5.2.10.ebuild 2473 RMD160 38c37f8d68bcb752afbeba0fe0bd4bb9ecc5b9be SHA1 f0b4ed6e0b66377ae5c85c9134f51117e8c22cdb SHA256 c3b9d39d8faa9f4eaf2a822e18884c177167cb422b91cbab21c57527a0a8b7d4 -MISC ChangeLog 1958 RMD160 5065c278e203fcfe9ab98fcb8a162e5f066995b2 SHA1 c3bd7102ca590f6612939002ab7cc726b173efb2 SHA256 84f0e6a57cf0fb69fc2681e756a9693eb15df28a0b82d3055b8f097520e82b49 +EBUILD novell-audtedirinst-8.8.5.13.ebuild 2657 RMD160 fffada2f870efc29d3fbceeba79f6a4d8a76d82c SHA1 634ef074ab1bffa062280516ec82aa968aadd06c SHA256 459362f979a65881ea3962a4e5ba515e7e75abc1533bc39316cf00d49f59cad1 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/net-nds/novell-audtedirinst/novell-audtedirinst-8.8.5.13.ebuild b/trunk/novell4gentoo/net-nds/novell-audtedirinst/novell-audtedirinst-8.8.5.13.ebuild index c1a63cca..561b37bd 100644 --- a/trunk/novell4gentoo/net-nds/novell-audtedirinst/novell-audtedirinst-8.8.5.13.ebuild +++ b/trunk/novell4gentoo/net-nds/novell-audtedirinst/novell-audtedirinst-8.8.5.13.ebuild @@ -46,7 +46,7 @@ src_unpack() { fi mkdir -p "${WORKDIR}"/${PN}-${MY_PV} cd ${PN}-${MY_PV} - rpm_unpack ../work/edir8852/${ndir}/novell-NDSmasv.${narch}.rpm + rpm_unpack ../work/edir8852/${ndir}/novell-AUDTedirinst.${narch}.rpm } src_compile() { :; } @@ -58,6 +58,8 @@ src_install() { rm "${D}"/opt/novell/eDirectory/$(get_libdir)/nds-modules/$(get_libdir) insinto /opt/novell/eDirectory/$(get_libdir)/nds-schema doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/nds-schema/* + insinto /opt/novell/eDirectory/$(get_libdir) + doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.* } pkg_nofetch() { einfo "This files require you to register at ${HOMEPAGE} (free account)" diff --git a/trunk/novell4gentoo/net-nds/novell-novllmgnt/Manifest b/trunk/novell4gentoo/net-nds/novell-novllmgnt/Manifest index 3f8e7486..e79ea333 100644 --- a/trunk/novell4gentoo/net-nds/novell-novllmgnt/Manifest +++ b/trunk/novell4gentoo/net-nds/novell-novllmgnt/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-novllmgnt-8.7.3.8.9.ebuild 1767 RMD160 d3779135b29fb7fcba762b6f9a7cb5a57b29d289 SHA1 7c5c56ed8df54a7656cd0f335733778948d6abb0 SHA256 2f9a69a972414e471acf42eab772b91f5bea8ba2223663c341ee9239ff03d55f -EBUILD novell-novllmgnt-8.8.5.2.10.ebuild 2320 RMD160 36e515ccd1d27ba8b940acc9055f60b3d30f6a7c SHA1 c668ada70e9ca6f804c7b824816167f196f0f676 SHA256 e791fc1a3675fad945ce6d5ed70134a014fbb702267a06f6fafcfd677eefc63b +EBUILD novell-novllmgnt-8.8.5.2.10.ebuild 3025 RMD160 f5659374e988bb7e7e925349f57ddbf7389da089 SHA1 82a4544db324e04e951908a65a85da44ea9e03aa SHA256 d63e710961e5468dcc2afd947dde2461a2eb31fced9cac7d03abb9f8fe65717b MISC ChangeLog 2137 RMD160 c6a9928868ce85ee9c77fd8b644c22b59502cff4 SHA1 95afa1f8efff51b23da871bb35257c7e233bc71d SHA256 d4625f33e2a98c787ac47963bbd71b03706656c0d09aff9ab645af46460a68aa MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/net-nds/novell-novllmgnt/novell-novllmgnt-8.8.5.2.10.ebuild b/trunk/novell4gentoo/net-nds/novell-novllmgnt/novell-novllmgnt-8.8.5.2.10.ebuild index c8b07910..370b887d 100644 --- a/trunk/novell4gentoo/net-nds/novell-novllmgnt/novell-novllmgnt-8.8.5.2.10.ebuild +++ b/trunk/novell4gentoo/net-nds/novell-novllmgnt/novell-novllmgnt-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,14 @@ MY_PV=$(replace_version_separator 4 '-') DESCRIPTION="Novell Language Management 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="" +IUSE="multilib" DEPEND="!net-nds/novell-novllmgnt:0 !net-nds/novell-novllmgnt:8.7" @@ -31,22 +33,29 @@ 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-NOVLlmgnt.${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-NOVLlmgnt.${march}.rpm + fi + rpm_unpack ../work/edir8852/${ndir}/novell-NOVLlmgnt.${narch}.rpm } src_compile() { :; } @@ -56,16 +65,32 @@ src_install() { dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.* # delete file collitions that screws u the system rm "${D}"/opt/novell/eDirectory/$(get_libdir)/libicu*.so - - + if has_multilib_profile + then + ABI="x86" dlib="$(get_libdir)" + ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${mlib}/*.so* + rm "${D}"/opt/novell/eDirectory/${dlib}/libicu*.so + 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" diff --git a/trunk/novell4gentoo/profiles/updates/4Q-2009 b/trunk/novell4gentoo/profiles/updates/4Q-2009 index 0820d4c1..f1806c6c 100644 --- a/trunk/novell4gentoo/profiles/updates/4Q-2009 +++ b/trunk/novell4gentoo/profiles/updates/4Q-2009 @@ -1 +1,10 @@ move net-misc/novell-ncp net-misc/novell-ncpenc +move app-admin/novell-consoleone-advanced-snapin app-admin/novell-advanced-admin +move app-admin/novell-consoleone-ichain-snapin app-admin/novell-ichain-admin +move app-admin/novell-consoleone-ncs-snapin app-admin/novell-ncs-admin +move app-admin/novell-consoleone-nisnfs-snapin app-admin/novell-nisnfs-admin +move app-admin/novell-consoleone-nmas-method-snapin app-admin/novell-nmas-method-admin +move app-admin/novell-consoleone-nmas-snapin app-admin/novell-nmas-admin +move app-admin/novell-consoleone-radius-snapin app-admin/novell-radius-admin +move app-admin/novell-consoleone-rconsolej app-admin/novell-rconsolej +move app-admin/novell-consoleone-unix-account-management-snapin app-admin/novell-unix-admin