From 3695e498ca5b6a32ef4b6f227b72a0be793c80c3 Mon Sep 17 00:00:00 2001 From: geos_one Date: Thu, 2 Apr 2009 19:15:37 +0000 Subject: [PATCH] correct rpm5 ecalls --- trunk/novell4gentoo/app-admin/novell-novlc1/Manifest | 1 + trunk/novell4gentoo/app-crypt/novell-npkit/Manifest | 2 +- .../novell-npkit/novell-npkit-3.3.0.20070815_p1823-r3.ebuild | 3 ++- trunk/novell4gentoo/eclass/rpm5.eclass | 4 ++-- trunk/novell4gentoo/net-misc/novell-ncp/Manifest | 1 + trunk/novell4gentoo/profiles/package.mask | 5 +++++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest index c91a6d31..8555729b 100644 --- a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest +++ b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest @@ -2,6 +2,7 @@ AUX ConsoleOne-136-pre 568 RMD160 d1fe940d9acd0cb2ce74cf56c1c34495eeb8c60b SHA1 DIST c1_1.3.6h_patch2.zip 797242 RMD160 796a2fcee8a3e0581b2876720110e0e8642e10fa SHA1 836b03278eac210445bbffe4ec55ea6234be8d80 SHA256 163bac905856402cb7ae3dfea73374fc9d0a4f501ba5f4e99e972f7285ba007b DIST c1_136h-linux.tar.gz 41771356 RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 SHA1 de6525532a5b89b0872c129a54bb82e8f2e08aec SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b EBUILD novell-novlc1-1.3.6_p2-r1.ebuild 5357 RMD160 48b7c407b35f2ad62d0c8b668c5bfded2d95dd04 SHA1 012e97f5d633eab5c2e9deeb41a01d2042d882e1 SHA256 128e7a449098a6c89bbd1a19a7e0f9a13771a5c281ff8ecd66797c8a0a70197f +EBUILD novell-novlc1-1.3.6_p2-r2.ebuild 5470 RMD160 c55660626ca6ccb55225ac695c72007be899d393 SHA1 e83f5e2babbf48c91aef8689a678ebfed29b39d9 SHA256 238be1ff3919b9f08d1ecd946b7a46aac8e36949019444b566c9715ecec5d0cf EBUILD novell-novlc1-1.3.6_p2.ebuild 5443 RMD160 2bfea03b9092590e028f4888841b3a96e72222c2 SHA1 d277cf86470f62446e826136148ca4e1efd277fe SHA256 0793f18cab69be1e8426c4f91cccc10e1cd63b8f7cdd45dc460d7f14b099f424 MISC ChangeLog 2149 RMD160 002b0d67e6a616e6c750727165327333d1c2d819 SHA1 da1bbef3db34f75d9efae060aef6ce00045871e6 SHA256 6b7256055a61dd3dcbf058033cebfff5799e943314ce9e6c74859be8a3804b9e MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest b/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest index e0f22e07..6921b416 100644 --- a/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest +++ b/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest @@ -2,6 +2,6 @@ AUX 80novell 175 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 SHA1 ce625b90ee DIST ss206_SLAH.tgz 31143941 RMD160 6dbfa508a374c2b5139cc45214e9ad1a17919791 SHA1 98916a96c7e5232a8deb3c2a9919e645f4bb1fdc SHA256 513faf240d85b189a64a1e88f9fdb08ee273c1f44e2bf0b51d9611fc9e4f3838 EBUILD novell-npkit-3.3.0.20070815_p1823-r1.ebuild 1687 RMD160 272a49c40ca90a718ace3debc571a47059cfa08d SHA1 6f92dae865da45bb25d7d83fe3f8b6fda3237d8e SHA256 74b6e497380ed769406a1aea45c1b0dcbbd54b1142e33120f29b309845f78f0b EBUILD novell-npkit-3.3.0.20070815_p1823-r2.ebuild 1723 RMD160 a00e7fd6e09c327501fe7775837379844cc97e14 SHA1 eb3651d6e192b4d6523129c9ac3c35e498d745b7 SHA256 5006a675a39bf68d77e6b79b0760a6c7b3404f8308178ad18c57a010ad920593 -EBUILD novell-npkit-3.3.0.20070815_p1823-r3.ebuild 1775 RMD160 cd5acb079bb65818581320e072ad0cd486dff928 SHA1 bb259c1bfd4147357d2dcc03feefdcec9b9436f6 SHA256 4f3cd98551659ab005e8600a322b3ba3a757b076a84a8c09304cafb3f1e385e5 +EBUILD novell-npkit-3.3.0.20070815_p1823-r3.ebuild 1832 RMD160 525cb1ffa0bf319fee9d629226343373daa47edf SHA1 4667c687d0483b330a2b4bc0fba2d5fa471c50ef SHA256 7f858ea6b7e53747e97eaa0c3892dc1893ecdf5a79bec4e6a7ad457ad5529bc0 MISC ChangeLog 1836 RMD160 ecbac78291099d38c0afb4db535adc9fc74ed160 SHA1 531652e043fce00738bbe5447b68a44c72b2d780 SHA256 890752e76e97ce83fa338d0296781248536587f4a72f97c9fd98dbe915388b41 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.0.20070815_p1823-r3.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.0.20070815_p1823-r3.ebuild index ac85d33f..e3920fcf 100644 --- a/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.0.20070815_p1823-r3.ebuild +++ b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.0.20070815_p1823-r3.ebuild @@ -26,7 +26,8 @@ DEPEND="!app-crypt/novell-npkit:0 !app-crypt/novell-npkit:8.8" RDEPEND="virtual/libc - sys-libs/lib-compat + x86? ( sys-libs/lib-compat ) + amd64? ( app-emulation/emul-linux-x86-compat ) >=app-crypt/novell-nici-2.7.3_p001 net-misc/novell-ntls:8.7 net-nds/novell-ndsbase:8.7 diff --git a/trunk/novell4gentoo/eclass/rpm5.eclass b/trunk/novell4gentoo/eclass/rpm5.eclass index 805a6a07..b93481ca 100644 --- a/trunk/novell4gentoo/eclass/rpm5.eclass +++ b/trunk/novell4gentoo/eclass/rpm5.eclass @@ -34,7 +34,7 @@ DEPEND=">=app-arch/rpm5offset-9.0" # extracts the contents of the RPM in ${WORKDIR} -rpm_unpack() { +rpm5_unpack() { local rpmfile rpmoff decompcmd rpmfile=$1 if [ -z "${rpmfile}" ]; then @@ -61,7 +61,7 @@ rpm_unpack() { return 0 } -rpm_src_unpack() { +rpm5_src_unpack() { local x prefix ext myfail OLD_DISTDIR for x in ${A}; do diff --git a/trunk/novell4gentoo/net-misc/novell-ncp/Manifest b/trunk/novell4gentoo/net-misc/novell-ncp/Manifest index 647c8397..9641eb6f 100644 --- a/trunk/novell4gentoo/net-misc/novell-ncp/Manifest +++ b/trunk/novell4gentoo/net-misc/novell-ncp/Manifest @@ -1,6 +1,7 @@ AUX 80novell-edir 268 RMD160 d67c5b1235cc2833cb5d13e9083e0cc312e1b55e SHA1 5402e607959e0c9ed9da3f9756ba709c780f8dc8 SHA256 6951e52fddfa7973a8ea99acfecfd758a9104de25f5a81b0b3efb439c9eab619 DIST edir87310_ftf1.tar.gz 254793819 RMD160 7631a2e782207848c8e76facb2d20f34e0477a40 SHA1 0d5109f3b110edf68385abe7d45adb9405566df9 SHA256 81bc6bf3abab9edd4792cf0ab5ea523dfca6f44b2627e20538db2977bb884c14 DIST edir87310b.tar.gz 254792877 RMD160 0b75eb50013f7c87c815a37d45786650d2f42bef SHA1 d976b29d6900a3ee9506e08abe783e4a9bf07b16 SHA256 e01297b4929c666ef2c5969b8a3098182ce96575ddf0a816a27451ece612aba6 +EBUILD novell-ncp-1.0.1_p110-r1.ebuild 1775 RMD160 3a248b9d7b1f53a11efe4c939b9cf318c2e9fc01 SHA1 8c96bcbf043b797e7a356c0baed8f02068cae621 SHA256 216ea070ba8d1b0343f6fd8f9aafd6cd0882aa6f0ff19093d5d25468d4a8d14c EBUILD novell-ncp-1.0.1_p110.ebuild 1643 RMD160 c6f689250b1d6b066b9ff87ec7bc5559593191b3 SHA1 1a4df1b3c8ef24ec7cafec9becf467855f309ec1 SHA256 3e43c18db9aedf3b588bceb088bff3ce8e7f3d45cbca4faa907b9d26c7ad60fa EBUILD novell-ncp-1.0.1_p118-r1.ebuild 1784 RMD160 0520f86e90c4af6c954624f24137093f584909f6 SHA1 1bfdcb9e1aa60915c5ef9e39b9fbd3678b4321af SHA256 128965e531de64661f1326168ff3ec579da12380e9ed727bcd8d25d4177fca4e EBUILD novell-ncp-1.0.1_p118.ebuild 1682 RMD160 c07da614d7f157284ac15bdc1f0ec33cfcd03a7c SHA1 573a77a1a962211a801a3e1bfce39aecdd982e3d SHA256 3fddbef77476028fe8f37f2856d40f6b792be2cafa2cbf032652ba9f4769cd6d diff --git a/trunk/novell4gentoo/profiles/package.mask b/trunk/novell4gentoo/profiles/package.mask index 826208a5..827072bb 100644 --- a/trunk/novell4gentoo/profiles/package.mask +++ b/trunk/novell4gentoo/profiles/package.mask @@ -48,3 +48,8 @@ # >=app-crypt/novell-npkiapi-3.1.1_p1 # >=app-crypt/novell-npkit-3.1.1_p1 # >=app-crypt/novell-pkiserver-3.1.1_p1 + +# =app-crypt/novell-nici-2.7.4.0.7 +# =app-crypt/novell-nici-2.7.4.3 +# =app-crypt/novell-nici-2.7.4.6 +