From 8b4260c9f93255fbf7fc28c699062abc3ffcf41b Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 15 Dec 2009 09:24:32 +0000 Subject: [PATCH] app-crypt/novell-nici: only use rpm5offset for the rpm --- trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog | 4 ++++ trunk/novell4gentoo/app-crypt/novell-nici/Manifest | 4 ++-- .../app-crypt/novell-nici/novell-nici-2.7.6.0.01.ebuild | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog index 220d70fd..b29b7582 100644 --- a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog +++ b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Dec 2009; Mario Fetka + novell-nici-2.7.6.0.01.ebuild: + only use rpm5offset for the rpm + 12 Dec 2009; Mario Fetka +novell-nici-2.7.6.0.01.ebuild: first round of edir 8.8 ebuild mods diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest index d3cd0fad..910cfbbd 100644 --- a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest +++ b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest @@ -10,6 +10,6 @@ DIST novell-client-3.0-sled11-x86_64-CD1.iso 7968768 RMD160 9262874512d6c2ac7ae6 EBUILD novell-nici-2.7.4.6-r1.ebuild 4146 RMD160 15f27ee7bc7e0b596e5b71e930779e4db7db2c9a SHA1 033963c36dba737a5de118b4e12d30dbfdea75b6 SHA256 cddb8bdc85fd5412b4e12c24a057016543d8028a8eb4e7d5188fa9a6bf1211d5 EBUILD novell-nici-2.7.4.6-r2.ebuild 4148 RMD160 8a6a60bdf7a070165f1a0937cd216d30dfd376f2 SHA1 23a685ab54202ee194bc224d28c7592e91e92a4b SHA256 6fd6da2a61313cf2de369ea1acfba0616c400ed2bdff35ee5398003b0534a3e4 EBUILD novell-nici-2.7.4.6.ebuild 4156 RMD160 dd4f764c4374880e87b346a9ed39fd1eb7463ae8 SHA1 125d1d47a89f7fd24f0034698fb4b3f92907471c SHA256 f6b65b49e3fe7c1cf0cf0cc14e13d67a65487bfa2775b778f0f52d1fb77e8862 -EBUILD novell-nici-2.7.6.0.01.ebuild 3932 RMD160 587c91f24873d5055df42b9ded5bb422450bfa5a SHA1 1fd04997177065ea90e7902bb13f3dc2f5d6021a SHA256 d14d01a3be6bdcc04ad20487176cdda5daa3696a32e26dec32704b0f5ef8ce70 -MISC ChangeLog 3771 RMD160 3ad10986116bdf8cb1c549a7667c668802918290 SHA1 5b382787b6736ad7445840339e97760eeb417eb2 SHA256 a00fea708234f4c343dd62acf4de964a9c41af1c208a286337b0ea39da2a7ad0 +EBUILD novell-nici-2.7.6.0.01.ebuild 3936 RMD160 fbf496f9a7e73f1eaa75332d8313c34d5fbfa475 SHA1 a28ce2f70aedf5203db25642d8c6be50994f7fd3 SHA256 5def6a149360bbd34e3d2d71ca5a7f9cd636b359ef1d06d33e6467261dd6752e +MISC ChangeLog 3890 RMD160 e009d649004da8a1fcb10d2654ebb9c2ed4edf20 SHA1 07ebb13a4f885e4e6d4fa3e98ffc607b294bfe6e SHA256 9b02e16fc5e51e7cfd1a28af020cd3137b91e8c3d834a2c80d29103980b1db18 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.6.0.01.ebuild b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.6.0.01.ebuild index 5fd305d2..4f8ea02e 100644 --- a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.6.0.01.ebuild +++ b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.6.0.01.ebuild @@ -9,7 +9,7 @@ NOVELL_FILE64="eDirectory_88SP5_Linux_x86_64.tar.gz" RESTRICT="mirror strip" USE_RPMOFFSET_ONLY="1" -inherit novell eutils rpm multilib versionator +inherit novell eutils rpm5 multilib versionator MY_PV=$(replace_version_separator 3 '-') @@ -39,7 +39,7 @@ src_unpack() { mkdir -p "${WORKDIR}"/${PN}-${PV} cd ${PN}-${PV} - rpm_unpack ../work/eDirectory/setup/nici-${MY_PV}.${narch}.rpm + rpm5_unpack ../work/eDirectory/setup/nici-${MY_PV}.${narch}.rpm elif use amd64 then narch=x86_64 @@ -47,11 +47,11 @@ src_unpack() { mkdir -p "${WORKDIR}"/${PN}-${PV} cd ${PN}-${PV} - rpm_unpack ../work/eDirectory/setup/nici64-${MY_PV}.${narch}.rpm + rpm5_unpack ../work/eDirectory/setup/nici64-${MY_PV}.${narch}.rpm if has_multilib_profile then - rpm_unpack ../work/eDirectory/setup/32-bit/nici-${MY_PV}.i386.rpm + rpm5_unpack ../work/eDirectory/setup/32-bit/nici-${MY_PV}.i386.rpm fi fi