Version bumps to 1.4.7_pre1 and 1.5.34, also addressing bug #207882

Package-Manager: portage-2.1.4.4

5 files changed, 128 insertions, 3 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 4b3d55f09ed9..010ca7aa2221 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.99 2008/03/20 15:11:24 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.100 2008/03/25 11:22:07 stefaan Exp $
+
+*openafs-kernel-1.5.34 (25 Mar 2008)
+*openafs-kernel-1.4.7_pre1 (25 Mar 2008)
+
+  25 Mar 2008; Stefaan De Roeck <stefaan@gentoo.org>
+  +openafs-kernel-1.4.7_pre1.ebuild, +openafs-kernel-1.5.34.ebuild:
+  Version bumps to 1.4.7_pre1 and 1.5.34, also addressing bug #207882
 
 *openafs-kernel-1.5.33 (20 Mar 2008)
 
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 69e1143325a0..ced1fd5af886 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -2,15 +2,19 @@ DIST openafs-1.2.13-src.tar.bz2 10354615 RMD160 a8060f844f82c11c558042660cba861b
 DIST openafs-1.4.5-src.tar.bz2 12483615 RMD160 baf00d0443ce113b380082b40b9b077cb4df5a17 SHA1 b9c8aaab204487e82ac8de261a2088e4eb145297 SHA256 5c6a5f4f7f1f9e173af03a82e7394e6e588477b504ce89106b7722b9728effbe
 DIST openafs-1.4.6-cvs20080222.patch.bz2 284987 RMD160 de642f29f66844a5ff8fbdd3dd2ec8af41748869 SHA1 5dcf1d85df1a90fc00cf596da76fe75b7a951c14 SHA256 749f32890ffb68b2a1a8348348854140baca781e9996c8b873b7e9d97d5c068a
 DIST openafs-1.4.6-src.tar.bz2 12485179 RMD160 856fa915c7847c25dab77b450bc8b0c6f6aeb308 SHA1 39489babe20c42c16ea8f11457de423b2bcca009 SHA256 996c6b53d81bd87f754e9596e24e11e65e6402b6ddab727634e05d73f3bb0ea1
+DIST openafs-1.4.7pre1-src.tar.bz2 11490376 RMD160 eb6cf0f4348b0fcaf8f893fd2c00c5cb5ee174c0 SHA1 b2c55831a64399b863364624885e669eab5b4001 SHA256 cf97bedd22556fcbdc61b5a13bde20669a63ebb709f02c6742fbe6f6be8f7cd8
 DIST openafs-1.5.27-src.tar.bz2 13241331 RMD160 759a6fd12e4a813e58c837df65c70d946b359629 SHA1 f3f725a25dd11e1d825db7b58994288f0273d8ed SHA256 0c7e9413990a779f357f4ca7bc730b98dbb07964f918141c404c83c9ec66d45b
 DIST openafs-1.5.33-src.tar.bz2 12129978 RMD160 4b407a03db00efb8bc0a263dfe39d80900da9b28 SHA1 fe6ba0b34a32e0c1bc2bff4e290cb903f7bab3bc SHA256 5b96b34fd84411f744fef6d712db06934c119dd4b6c3cef30271f77a5bc3c51e
+DIST openafs-1.5.34-src.tar.bz2 12151866 RMD160 188f79e90de1eaa8457f2c5612cb2512a2e996e5 SHA1 11d9526b46395397a15ea83654584aaf61c7e594 SHA256 015f448bbc05e2b774858a6adfad1a37ce4d4aa402c6f63325c638d0153912b9
 DIST openafs-gentoo-0.14.tar.bz2 18293 RMD160 2a7ed8a40395d402de2f972fe0f96154d811e2b6 SHA1 dbff67178e7eae1bdbd5af43f6bedaeb747bd25a SHA256 e27918d395d656659b6f0d288d8a4d2501bd4ca6582824b8f3bbd420b06e6f6c
 DIST openafs-gentoo-0.2a.tar.bz2 17761 RMD160 97f6b61393024747f5a4614d628f8ec6df802918 SHA1 c6accd6e2576d5f8cef41663f5db07e9fc2571a5 SHA256 6ab8a1564c0f21df0278c59214ef5e4cc8edc269442edf34d4c6408103f54f79
 EBUILD openafs-kernel-1.2.13.ebuild 1545 RMD160 8807013bdc7e1bff47f62ece54de42e7335b9dc8 SHA1 a9eac29fc2634a99efffc2a38030b97ecfc80ad5 SHA256 65490ff8425cbdafb1bc81dd4ed9c677bf069d2789b8352f95a491c7b0f65bdb
 EBUILD openafs-kernel-1.4.5.ebuild 1652 RMD160 72cdd4a658f47c617f58e2635e76b4c3e2ad18a1 SHA1 98f36bdfc8f7a79f3d35d7eab1d4c409a0e0febc SHA256 d4ff04fca1529cd92ddda7498b1f40716724b6eb8b2e071a4aff4376f76d389b
 EBUILD openafs-kernel-1.4.6.ebuild 1649 RMD160 7a2c6b5dafcb7666ebfe45bc4ee278ae907fd089 SHA1 3f2fa2cea7a51ad7e92ee88bdcf325e0416d7e8b SHA256 a1b6b12ae2ffab46cc42b554e91a9e7be7718a23633c1abe7b8d58661e5d19eb
 EBUILD openafs-kernel-1.4.6_p20080222.ebuild 1823 RMD160 7adc2c2a6ed26091e344cbef1fc6b598c78b31dc SHA1 29bf0c7833edb4b95d5eca909526dda633f4099c SHA256 7ca987c869122c0d47037e603b3696c359a3c41d6cd6d021010dbde4db101c9e
+EBUILD openafs-kernel-1.4.7_pre1.ebuild 1700 RMD160 953b1ecfce6e0cfcd3038328a2f733adc5edafb8 SHA1 e9acff27917faa6a2b7b05e999dc2299a091051c SHA256 b714eb1d089061359f4b32e4d5ab5619384e2d5df1b63995d1ff77900f35a00f
 EBUILD openafs-kernel-1.5.27.ebuild 1509 RMD160 6c997328aab20126c2804b4387386284a7601ba1 SHA1 97a8e6f76096af8484bb7c4be82006bb45bd4324 SHA256 79e253cdc94c6c1048b412d13dd8809cd6b41afeb82d4d34a14e470d7d39c2ce
 EBUILD openafs-kernel-1.5.33.ebuild 1509 RMD160 4308ca49d2f57c965625fe701be4d0292bf29dd9 SHA1 1e526a76b0acd989ed733d516347f3b32db1cca2 SHA256 d583a45c02617c0a6ebe5c6b0c9cdf4c0cd2ff20a724eb560916b6ec8b3a9036
-MISC ChangeLog 15751 RMD160 e0062415b6ae19f6dcf8506654b7c7fbd262f05d SHA1 4b0172804a17fef20488e139e39ecb449513906f SHA256 7a4d17bddc69d620e19e0b0df08c62fda1e244677618e24363fb6bfcf11a5913
+EBUILD openafs-kernel-1.5.34.ebuild 1513 RMD160 81447b24d073df8120a3fc0def91a20f070093aa SHA1 e5ec963ef99398c5affb0bb261878af1ec9f3ac0 SHA256 bcf75e4d76fbd5b835a0d2bbdcff369d19eaf19b48fc27e11d5cdcbdd85b4e28
+MISC ChangeLog 16023 RMD160 53a04f1728a23fa40e37db79ec4b164d4e5b22c1 SHA1 1995709c22a2b3fd0040bda8c92a013d68bd04b3 SHA256 9ed6f4afa1fe9b4addfb91e1d0102ae3d26205a08bd04bef7370c1512aebdab7
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.7_pre1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.7_pre1.ebuild
new file mode 100644
index 000000000000..654bd1c6d6ab
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.4.7_pre1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 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.4.7_pre1.ebuild,v 1.1 2008/03/25 11:22:07 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.14
+MY_PN=${PN/-kernel}
+MY_PV=${PV/_pre/pre}
+MY_P=${MY_PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+
+CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS"
+ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${MY_P}-src.tar.bz2
+	unpack ${MY_PN}-gentoo-${PATCHVER}.tar.bz2
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_OUT_DIR} || die "Failed: econf"
+
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
+}
+
+src_install() {
+	MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*)
+	[ -f ${MOD_SRCDIR}/libafs.${KV_OBJ} ] \
+			|| die "Couldn't find compiled kernel module"
+
+	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.5.34.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.5.34.ebuild
new file mode 100644
index 000000000000..98a0d8e6b869
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.5.34.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 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.34.ebuild,v 1.1 2008/03/25 11:22:07 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.14
+MY_PN=${PN/-kernel}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+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="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+
+CONFIG_CHECK="!DEBUG_RODATA"
+DEBUG_RODATA_ERROR="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_OUT_DIR} || die "Failed: econf"
+
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
+}
+
+src_install() {
+	MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*)
+	[ -f ${MOD_SRCDIR}/libafs.${KV_OBJ} ] \
+			|| die "Couldn't find compiled kernel module"
+
+	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR) afspag(fs/openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index ca170cf1f59b..6bc64e3e15a0 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -12,10 +12,14 @@ DIST openafs-1.4.5-src.tar.bz2 12483615 RMD160 baf00d0443ce113b380082b40b9b077cb
 DIST openafs-1.4.6-cvs20080222.patch.bz2 284987 RMD160 de642f29f66844a5ff8fbdd3dd2ec8af41748869 SHA1 5dcf1d85df1a90fc00cf596da76fe75b7a951c14 SHA256 749f32890ffb68b2a1a8348348854140baca781e9996c8b873b7e9d97d5c068a
 DIST openafs-1.4.6-doc.tar.bz2 3217027 RMD160 abfb25ed194b1c7a1fe23d9d05336c5ab9ba99d3 SHA1 a77e7fbeff50f34f88e2f833848e9b5dacd6f900 SHA256 fe463510c0cfc773461c7ba16d77ee09d7b3ade2481f8cc58cf233a02aa1f6cc
 DIST openafs-1.4.6-src.tar.bz2 12485179 RMD160 856fa915c7847c25dab77b450bc8b0c6f6aeb308 SHA1 39489babe20c42c16ea8f11457de423b2bcca009 SHA256 996c6b53d81bd87f754e9596e24e11e65e6402b6ddab727634e05d73f3bb0ea1
+DIST openafs-1.4.7pre1-doc.tar.bz2 3244642 RMD160 90ef44450544b530a23264a03fe73c93993024cc SHA1 a59fe1c8bba1d9d84616af7eb1eab1ff90b6a68b SHA256 93a5e132d0b741d941442cb005b2ad18825d6aa29c2e2c53b06c7efd6b984250
+DIST openafs-1.4.7pre1-src.tar.bz2 11490376 RMD160 eb6cf0f4348b0fcaf8f893fd2c00c5cb5ee174c0 SHA1 b2c55831a64399b863364624885e669eab5b4001 SHA256 cf97bedd22556fcbdc61b5a13bde20669a63ebb709f02c6742fbe6f6be8f7cd8
 DIST openafs-1.5.27-doc.tar.bz2 3228885 RMD160 6d88bc9c46d46db145a6a4fc692631d572fdf34c SHA1 bd20404be3f675263acd7b0b347e9bb07442a3e9 SHA256 ce44c2205f24976485aac7ee02d5582414b34efff8f516cc085bfe4bea52ca12
 DIST openafs-1.5.27-src.tar.bz2 13241331 RMD160 759a6fd12e4a813e58c837df65c70d946b359629 SHA1 f3f725a25dd11e1d825db7b58994288f0273d8ed SHA256 0c7e9413990a779f357f4ca7bc730b98dbb07964f918141c404c83c9ec66d45b
 DIST openafs-1.5.33-doc.tar.bz2 3257886 RMD160 93032e687aa8718e43315f6115dd7aa75f5a64d8 SHA1 b66ee02e9da6e5aac7f78f6ea9a35608a998f49d SHA256 94cbe6004935a345f6ba1e153377cff12362eac7a9ef2b636860ff5e05798bab
 DIST openafs-1.5.33-src.tar.bz2 12129978 RMD160 4b407a03db00efb8bc0a263dfe39d80900da9b28 SHA1 fe6ba0b34a32e0c1bc2bff4e290cb903f7bab3bc SHA256 5b96b34fd84411f744fef6d712db06934c119dd4b6c3cef30271f77a5bc3c51e
+DIST openafs-1.5.34-doc.tar.bz2 3268687 RMD160 c7824edf73b4cd8f0929cf7d4fab5b4c17aebb80 SHA1 f449554f6419106cd679238ee2a7211777ae638e SHA256 ab5da4a359e61ef9b81e5059e470ea066c67e6bd8bc2a898f704aff2c42cfef3
+DIST openafs-1.5.34-src.tar.bz2 12151866 RMD160 188f79e90de1eaa8457f2c5612cb2512a2e996e5 SHA1 11d9526b46395397a15ea83654584aaf61c7e594 SHA256 015f448bbc05e2b774858a6adfad1a37ce4d4aa402c6f63325c638d0153912b9
 DIST openafs-gentoo-0.14.tar.bz2 18293 RMD160 2a7ed8a40395d402de2f972fe0f96154d811e2b6 SHA1 dbff67178e7eae1bdbd5af43f6bedaeb747bd25a SHA256 e27918d395d656659b6f0d288d8a4d2501bd4ca6582824b8f3bbd420b06e6f6c
 DIST openafs-gentoo-0.2b.tar.bz2 17242 RMD160 0812d32bf14229d40bbe79323b38b268da6cb25f SHA1 a000b2f06ed3d21dad7a7843475ee834b0790178 SHA256 cf72505983602224a5ff8c3195ac351a7baf96d669a09575040f2ecb6e233dd1
 EBUILD openafs-1.2.10-r1.ebuild 2348 RMD160 a199118b4a137f9f784fc1bbb2ad746a0b58673c SHA1 1dcea670d536b8342dc84548fd9236a593682299 SHA256 4ab8bffcf9bcb3eb4fd9baa464be4e774d32ebf4b9e517d30e2c9c1aa8dde1c1
@@ -24,7 +28,9 @@ EBUILD openafs-1.4.5-r2.ebuild 4349 RMD160 e7a04947d3e61a52ad44ba47331cee9d33609
 EBUILD openafs-1.4.5.ebuild 4336 RMD160 151456e77d3399cc9d654a0b729e6863a13d1095 SHA1 24d4eebf233d912b48eeaa100ad3eb9ec7122cb1 SHA256 b5c004cff8f4240ba8db9dc8cd488286fa896f2b09a71403b395170bafddff4c
 EBUILD openafs-1.4.6.ebuild 4341 RMD160 a22676428837ff00762f7530c7245a6b405c6949 SHA1 a4222de4091ceba7512914346a60d2bebed79ad6 SHA256 e4bd02cf1c37bb7d74e1f727088bf02c18d1214d85b3b0f0021160e6dbca5904
 EBUILD openafs-1.4.6_p20080222.ebuild 4897 RMD160 a26cecfbf39106d69d4095b2b81d55e0f41945c9 SHA1 df0372e765685b7c9cf3030e4c741f6704e0a002 SHA256 847149ed63a03a58e63716ac8b8164fb2122b45d02c7cc811a15f028658ba0b9
+EBUILD openafs-1.4.7_pre1.ebuild 4731 RMD160 2c3e6b76d5addd786c53f4e01b8b1bc234176317 SHA1 382b873675b649f482917220e21e4eff48531a01 SHA256 c15c9c27885c783e25e9c2677ebbcb253b814c2ff0dcdbb70a9d5b0f8dff4fdb
 EBUILD openafs-1.5.27.ebuild 4288 RMD160 b9aefaa1997f19489130804b37d061ac7de3ecd6 SHA1 9051af08147039dcbf6b5ae5460c58635bb6b586 SHA256 af518b05a2af13a7c8dee04af5361bdeb301374583cfa4f7b92bb63d50db37e9
 EBUILD openafs-1.5.33.ebuild 4288 RMD160 d287e9b0261c8b4fa10b7b8a6d465f9933b27dab SHA1 25dfa7289bcfa4fa96267001f4983b26b7f409a9 SHA256 2026b3f109539496ffc258e107f2e2fd207b629e5a3fdb4c1ef5b77a45601fc4
-MISC ChangeLog 22145 RMD160 1125f0742cf4baa60fdf68ec1dd8080bb6de3d72 SHA1 c30c6ecd690022c52f23da680efd107a8cac49c3 SHA256 e07d3c467af6ea5574441f3c3d5103eeb5fa05d5240a5e85ceffaed7ca183c98
+EBUILD openafs-1.5.34.ebuild 4288 RMD160 d2198b8e8c5aa4f19c50c37b8437156405b2a850 SHA1 54d2ed75c695dcd41400fe43fb1307cca4abaaac SHA256 9dd45f5d87c98437ebc2438110f36fde84d1fd6dc047d17f922622763d7c8f73
+MISC ChangeLog 22359 RMD160 ac739b73bb4625fbba5e064a1dea3795d6d383fe SHA1 9fcbf00b95b40b294f9891209d9ddc6f620f34ec SHA256 d691478e61020e3d4d1cc5cc4d7b87f93bb1177826f04ca6334b551d383365a6
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62