The following ebuilds should be created: 1) net-fs/openafs-kernel-1.6.0.ebuild 2) net-fs/openafs-1.6.0.ebuild 3) net-fs/openafs-kernel-1.4.14.1.ebuild 4) net-fs/openafs-1.4.14.1.ebuild Here are the diffs to previous versions: 1) # diff openafs-kernel-1.6.0_pre7.ebuild openafs-kernel-1.6.0.ebuild 17c17 < SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2 --- > SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2 2) # diff openafs-1.6.0_pre7.ebuild openafs-1.6.0.ebuild 16,17c16,17 < SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2 < http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2 --- > SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2 > http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2 3) # diff openafs-kernel-1.4.14.ebuild openafs-kernel-1.4.14.1.ebuild 7c7 < inherit eutils autotools linux-mod versionator toolchain-funcs --- > inherit eutils autotools linux-mod versionator toolchain-funcs linux-info 9c9 < PATCHVER=0.16 --- > KV_max=2.6.38 12,13c12,13 < MY_PV=$(get_version_component_range 1-3) < PVER="1" --- > MY_PV=$(get_version_component_range 1-4) > PVER="2" 26c26 < CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS" --- > CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS" 30a31,35 > if kernel_is -gt ${KV_max//./ } > then > eerror "${P} does not support Linux kernel version ${KV_max} or higher" > die > fi 4) # diff openafs-1.4.14-r1.ebuild openafs-1.4.14.1.ebuild 9c9 < MY_PV=$(get_version_component_range 1-3) --- > MY_PV=$(get_version_component_range 1-4) 1.6.0 and 1.4.14.1 require new patchsets openafs-1.6.0-patches-1.tar.bz2 openafs-1.4.14.1-patches-2.tar.bz2 both are clones of previous versions The 1.6.0 mask should be removed from package.mask: # Stefaan De Roeck <stefaan@gentoo.org> (19 Mar 2011) # New major upstream release. # Needs testing before going to ~arch. >=net-fs/openafs-1.6 >=net-fs/openafs-kernel-1.6 Those two should be marked stable for all the archs (amd64 sparc x86) openafs-kernel-1.4.14.ebuild openafs-1.4.14-r1.ebuild The following ebuilds should be removed: openafs-kernel-1.4.12.1.ebuild openafs-kernel-1.4.9.ebuild openafs-kernel-1.5.34.ebuild openafs-kernel-1.6.0_pre2.ebuild openafs-kernel-1.6.0_pre3.ebuild openafs-kernel-1.6.0_pre6.ebuild openafs-1.4.12.1-r2.ebuild openafs-1.4.14.ebuild openafs-1.4.9.ebuild openafs-1.5.34.ebuild openafs-1.6.0_pre2.ebuild openafs-1.6.0_pre3.ebuild openafs-1.6.0_pre6.ebuild This should resolve the following bugs: 209194 ebuild removed 265538 ebuild removed 355533 ebuild removed 359377 fixed by 1.4.14.1 367341 fixed by CONFIG KEYS 367343 ebuild removed 382871 1.6.0 ebuild
please post the actual ebuilds you want merged, or one diff that gets from the respective previous version to the final one
Created attachment 286917 [details] openafs ebuilds
marked stable: http://sources.gentoo.org/net-fs/openafs/openafs-1.4.14-r1.ebuild?r1=1.1&r2=1.2 http://sources.gentoo.org/net-fs/openafs-kernel/openafs-kernel-1.4.14.ebuild?r1=1.1&r2=1.2
should be all set now in the tree; thanks for the report! Commit message: Version bump http://sources.gentoo.org/net-fs/openafs-kernel/openafs-kernel-1.4.14.1.ebuild?rev=1.1 http://sources.gentoo.org/net-fs/openafs-kernel/openafs-kernel-1.6.0.ebuild?rev=1.1
should be all set now in the tree; thanks for the report! Commit message: Version bump http://sources.gentoo.org/net-fs/openafs/openafs-1.4.14.1.ebuild?rev=1.1 http://sources.gentoo.org/net-fs/openafs/openafs-1.6.0.ebuild?rev=1.1
all the relevant bugs should be closed now. we don't close security bugs, security takes care of that.
