From 7abba12b8ad90ab04ee8f7603012e1eebc4243ce Mon Sep 17 00:00:00 2001 From: Stefaan De Roeck Date: Thu, 15 Feb 2007 17:48:27 +0000 Subject: [PATCH] Version bump for 1.5.x, remove obsolete ebuild Package-Manager: portage-2.1.2-r8 --- net-fs/openafs-kernel/ChangeLog | 8 ++++- .../files/digest-openafs-kernel-1.5.12 | 6 ---- .../files/digest-openafs-kernel-1.5.15 | 6 ++++ ...12.ebuild => openafs-kernel-1.5.15.ebuild} | 13 +++----- net-fs/openafs/ChangeLog | 8 ++++- net-fs/openafs/files/digest-openafs-1.5.12 | 9 ------ net-fs/openafs/files/digest-openafs-1.5.15 | 9 ++++++ ...fs-1.5.12.ebuild => openafs-1.5.15.ebuild} | 32 +++++++++++-------- 8 files changed, 52 insertions(+), 39 deletions(-) delete mode 100644 net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 create mode 100644 net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 rename net-fs/openafs-kernel/{openafs-kernel-1.5.12.ebuild => openafs-kernel-1.5.15.ebuild} (81%) delete mode 100644 net-fs/openafs/files/digest-openafs-1.5.12 create mode 100644 net-fs/openafs/files/digest-openafs-1.5.15 rename net-fs/openafs/{openafs-1.5.12.ebuild => openafs-1.5.15.ebuild} (93%) diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog index 11d3c502f21c..a3301ff7837a 100644 --- a/net-fs/openafs-kernel/ChangeLog +++ b/net-fs/openafs-kernel/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/openafs-kernel # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.55 2007/02/15 15:44:04 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.56 2007/02/15 17:47:48 stefaan Exp $ + +*openafs-kernel-1.5.15 (15 Feb 2007) + + 15 Feb 2007; Stefaan De Roeck + -openafs-kernel-1.5.12.ebuild, +openafs-kernel-1.5.15.ebuild: + Version bump for 1.5.x, remove obsolete ebuild *openafs-kernel-1.4.3_rc2 (15 Feb 2007) diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 deleted file mode 100644 index fc46b729ec58..000000000000 --- a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 636e80d5c60a5ed10477b4085af452a3 openafs-1.5.12-src.tar.bz2 13090135 -RMD160 a778da90c28b71187b6af262909eb01ae8e1d720 openafs-1.5.12-src.tar.bz2 13090135 -SHA256 7c9af7b47b8a23824c6b0ebe6bc2cbfb9405e17d238a96212555c702c564f2b1 openafs-1.5.12-src.tar.bz2 13090135 -MD5 f3407a8924b2690e8774d8f1d6c11a5a openafs-gentoo-0.10.tar.bz2 16807 -RMD160 cf7c3e16387dbc274140e0f96b25a2a749e87b45 openafs-gentoo-0.10.tar.bz2 16807 -SHA256 d462f3168610d73153f20eb37057f7f8607d95c56342a5f1de8c984174300a6d openafs-gentoo-0.10.tar.bz2 16807 diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 new file mode 100644 index 000000000000..78a3c13556ee --- /dev/null +++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 @@ -0,0 +1,6 @@ +MD5 90eb3e6ead60dbad000c4358dc3f3334 openafs-1.5.15-src.tar.bz2 12962614 +RMD160 c93c92978c37b02d67396cea2320991eb1fdbb91 openafs-1.5.15-src.tar.bz2 12962614 +SHA256 1ae53aa1e04aa491c0e18883d2a884fe6575ae325b22b49efced419be962e9f1 openafs-1.5.15-src.tar.bz2 12962614 +MD5 7df64c331d40c0206e7ed4c707971efe openafs-gentoo-0.12.tar.bz2 16630 +RMD160 fdc543c1e4318e1685a1f785c615e89d7bbd9b89 openafs-gentoo-0.12.tar.bz2 16630 +SHA256 d5b832b938c18d1ed22f4c7353139f86d1c4c750f8a8713128c51cc193be6adb openafs-gentoo-0.12.tar.bz2 16630 diff --git a/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild similarity index 81% rename from net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild rename to net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild index c523f4a18674..7fa19d27dc70 100644 --- a/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild +++ b/net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild,v 1.2 2006/12/22 14:52:24 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild,v 1.1 2007/02/15 17:47:48 stefaan Exp $ inherit eutils linux-mod versionator toolchain-funcs -PATCHVER=0.10 +PATCHVER=0.12 MY_PN=${PN/-kernel} MY_P=${MY_PN}-${PV} S=${WORKDIR}/${MY_P} @@ -13,7 +13,7 @@ HOMEPAGE="http://www.openafs.org/" SRC_URI="http://openafs.org/dl/${MY_PN}/${PV}/${MY_P}-src.tar.bz2 mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2" -LICENSE="IPL-1" +LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="" @@ -32,16 +32,13 @@ src_unpack() { EPATCH_SUFFIX="patch" epatch ${PATCHDIR} - # fix unresolved symbol on amd64 (bug #149274) - epatch ${FILESDIR}/tasklist_lock_1.5.12.patch - ./regen.sh || die "Failed: regenerating configure script" } src_compile() { ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf" - ARCH="$(tc-arch-kernel)" make only_libafs || die "Failed: make" + ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake" } src_install() { diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog index 8da4eeaf60d4..b969fb710034 100644 --- a/net-fs/openafs/ChangeLog +++ b/net-fs/openafs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/openafs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.96 2007/02/15 15:45:45 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.97 2007/02/15 17:48:27 stefaan Exp $ + +*openafs-1.5.15 (15 Feb 2007) + + 15 Feb 2007; Stefaan De Roeck -openafs-1.5.12.ebuild, + +openafs-1.5.15.ebuild: + Version bump for 1.5.x, remove obsolete ebuild *openafs-1.4.3_rc2 (15 Feb 2007) diff --git a/net-fs/openafs/files/digest-openafs-1.5.12 b/net-fs/openafs/files/digest-openafs-1.5.12 deleted file mode 100644 index 6eb15850829e..000000000000 --- a/net-fs/openafs/files/digest-openafs-1.5.12 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 675c5f5f80f96ff09af3409b1727b6e5 openafs-1.5.12-doc.tar.bz2 3083685 -RMD160 76608ea4b0d139beb0f33b071180c78a4de9e5d9 openafs-1.5.12-doc.tar.bz2 3083685 -SHA256 f178d08af3aab9211ea551876d7ba9a68b6ff0a6d82b82d5ef2fb798f18a50b2 openafs-1.5.12-doc.tar.bz2 3083685 -MD5 636e80d5c60a5ed10477b4085af452a3 openafs-1.5.12-src.tar.bz2 13090135 -RMD160 a778da90c28b71187b6af262909eb01ae8e1d720 openafs-1.5.12-src.tar.bz2 13090135 -SHA256 7c9af7b47b8a23824c6b0ebe6bc2cbfb9405e17d238a96212555c702c564f2b1 openafs-1.5.12-src.tar.bz2 13090135 -MD5 f3407a8924b2690e8774d8f1d6c11a5a openafs-gentoo-0.10.tar.bz2 16807 -RMD160 cf7c3e16387dbc274140e0f96b25a2a749e87b45 openafs-gentoo-0.10.tar.bz2 16807 -SHA256 d462f3168610d73153f20eb37057f7f8607d95c56342a5f1de8c984174300a6d openafs-gentoo-0.10.tar.bz2 16807 diff --git a/net-fs/openafs/files/digest-openafs-1.5.15 b/net-fs/openafs/files/digest-openafs-1.5.15 new file mode 100644 index 000000000000..b2cacb5d20d4 --- /dev/null +++ b/net-fs/openafs/files/digest-openafs-1.5.15 @@ -0,0 +1,9 @@ +MD5 c6383da882d4321036dc5bc1d6a9e50a openafs-1.5.15-doc.tar.bz2 3084560 +RMD160 073195d2954cfe991c1bea41f4d883b75dc5c67e openafs-1.5.15-doc.tar.bz2 3084560 +SHA256 393713381cee8438eaead0269c47ea4358c17d1bea9dff5c21d196f6cd84fe6c openafs-1.5.15-doc.tar.bz2 3084560 +MD5 90eb3e6ead60dbad000c4358dc3f3334 openafs-1.5.15-src.tar.bz2 12962614 +RMD160 c93c92978c37b02d67396cea2320991eb1fdbb91 openafs-1.5.15-src.tar.bz2 12962614 +SHA256 1ae53aa1e04aa491c0e18883d2a884fe6575ae325b22b49efced419be962e9f1 openafs-1.5.15-src.tar.bz2 12962614 +MD5 7df64c331d40c0206e7ed4c707971efe openafs-gentoo-0.12.tar.bz2 16630 +RMD160 fdc543c1e4318e1685a1f785c615e89d7bbd9b89 openafs-gentoo-0.12.tar.bz2 16630 +SHA256 d5b832b938c18d1ed22f4c7353139f86d1c4c750f8a8713128c51cc193be6adb openafs-gentoo-0.12.tar.bz2 16630 diff --git a/net-fs/openafs/openafs-1.5.12.ebuild b/net-fs/openafs/openafs-1.5.15.ebuild similarity index 93% rename from net-fs/openafs/openafs-1.5.12.ebuild rename to net-fs/openafs/openafs-1.5.15.ebuild index a3fbad2edd56..ae0dc59ffa8e 100644 --- a/net-fs/openafs/openafs-1.5.12.ebuild +++ b/net-fs/openafs/openafs-1.5.15.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.12.ebuild,v 1.1 2006/12/03 08:17:44 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.15.ebuild,v 1.1 2007/02/15 17:48:27 stefaan Exp $ -inherit flag-o-matic eutils toolchain-funcs versionator +inherit flag-o-matic eutils linux-mod toolchain-funcs versionator -PATCHVER=0.10 +PATCHVER=0.12 DESCRIPTION="The OpenAFS distributed file system" HOMEPAGE="http://www.openafs.org/" SRC_URI="http://openafs.org/dl/${PN}/${PV}/${P}-src.tar.bz2 doc? ( http://openafs.org/dl/${PN}/${PV}/${P}-doc.tar.bz2 ) mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2" -LICENSE="IPL-1" +LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="debug kerberos pam doc" -RDEPEND="=net-fs/openafs-kernel-${PV}* +RDEPEND="~net-fs/openafs-kernel-${PV} pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )" @@ -43,12 +43,14 @@ src_compile() { myconf="--with-krb5-conf=$(type -p krb5-config)" fi + ARCH="$(tc-arch-kernel)" \ XCFLAGS="${CFLAGS}" \ econf \ $(use_enable pam) \ $(use_enable debug) \ --enable-largefile-fileserver \ --enable-supergroups \ + --with-linux-kernel-headers=${KV_DIR} \ ${myconf} || die econf emake -j1 all_nolibafs || die "Build failed" @@ -67,20 +69,19 @@ src_install() { rm ${D}/usr/bin/compile_et # avoid collision with mit_krb5's version of kpasswd - mv ${D}/usr/bin/kpasswd ${D}/usr/bin/kpasswd_afs - mv src/man/kpasswd.1 src/man/kpasswd_afs.1 - - # install manuals - doman src/man/*.? - - use kerberos && doman src/aklog/aklog.1 - use pam && doman src/pam/pam_afs.5 + (cd ${D}/usr/bin; mv kpasswd kpasswd_afs) + use doc && (cd doc/man-pages/man1; mv kpasswd.1 kpasswd_afs.1) # minimal documentation dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB # documentation package if use doc; then + # install manuals + doman doc/man-pages/man?/*.? + + use pam && doman src/pam/pam_afs.5 + cp -pPR doc/* ${D}/usr/share/doc/${PF} fi @@ -101,6 +102,9 @@ src_install() { keepdir /var/lib/openafs/db diropts -m0755 keepdir /var/lib/openafs/logs + + # link logfiles to /var/log + dosym ../lib/openafs/logs /var/log/openafs } migrate_to_fhs() { -- 2.26.2