From: Stefan Schweizer Date: Fri, 23 Feb 2007 12:28:43 +0000 (+0000) Subject: move variables into the right place, bug 168051 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51c8dada041d6aa737361754d343726bb83e4a29;p=gentoo.git move variables into the right place, bug 168051 Package-Manager: portage-2.1.2-r9 --- diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog index a4282b1d5dec..ad2b5c75844c 100644 --- a/sys-fs/fuse/ChangeLog +++ b/sys-fs/fuse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/fuse # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.76 2007/02/21 04:22:36 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.77 2007/02/23 12:28:43 genstef Exp $ + + 23 Feb 2007; fuse-2.6.0_rc1.ebuild, + -fuse-2.6.0.ebuild, fuse-2.6.1.ebuild, fuse-2.6.3.ebuild: + move variables into the right place, bug 168051 21 Feb 2007; Joseph Jezak fuse-2.6.1.ebuild: Marked ppc stable for bug #150978. diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index db08dfa287c4..50dd111e6ded 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX fuse-2.6.0_rc3-no-mknod.patch 476 RMD160 c21064b080b70fb3757638b4e98e5d83a25a9d57 SHA1 3935d74d2744fdeb55d15a1e840db27052e55645 SHA256 a9181c2e453680680105eb3799806eb2f5a54094568c1998f843651a34ce82fc MD5 69d0114b2cdbf042c20325071bf6db38 files/fuse-2.6.0_rc3-no-mknod.patch 476 RMD160 c21064b080b70fb3757638b4e98e5d83a25a9d57 files/fuse-2.6.0_rc3-no-mknod.patch 476 @@ -18,36 +15,28 @@ MD5 b7f8564dde2503fa007e794f256e8886 files/fuse.init 877 RMD160 89b47233ccd7b14728809e79e4c9524a05ccca2a files/fuse.init 877 SHA256 c593454277048685662adc8f492a79ef13376c7efccc3397a63f50df3958ca8a files/fuse.init 877 DIST fuse-2.6.0-rc1.tar.gz 435861 RMD160 c872c7835daf6b6f85342f5f05f36bb8c2f29aeb SHA1 0eff5d3d89012f9fd76ed8584b4f65d9d45af584 SHA256 f7046379088ff6bbceaaf989a9ec838f7bf8d7fd7833ffdecdc8a32dc5bd9dce -DIST fuse-2.6.0.tar.gz 470514 RMD160 bf36a008d17fbb1169bfd7d077a53587df90ddb4 SHA1 23a6919b92d6a5935902c143baa7a1d19754e6a5 SHA256 782137879b964139e2dc4767114b763cb0e11ae322476404920cf767728e659e DIST fuse-2.6.1.tar.gz 472606 RMD160 99624de23edb634b5e92c86fb75fa266aeff5a65 SHA1 85ec4458d0ab2647b6b43605f0200006d89981ed SHA256 e5d039f1adcb5fcc16f5f3eb1c7d95918b62ace79f75d327c72707cafdd8be7c DIST fuse-2.6.3.tar.gz 473147 RMD160 df05bc42cb4c97f9e54048662f64a8cac5713f18 SHA1 d6ecda7341008ac157f55cf901309dda10f58faf SHA256 804d7fae424c97dc3790ad12d798e7b27dc6c12e4116f8bd69ca0130773d3f9d -EBUILD fuse-2.6.0.ebuild 1897 RMD160 25f70b575377684de2cc82a670a3d82b9ee45a4e SHA1 8e4b1e8a554886e9bfb41adc98afcfa103efa48d SHA256 21fdccfce481397d8d4247adab93b29dc219933041b51ade7065af86690a33ed -MD5 b9f56affac56a4ea643294ee8472a72f fuse-2.6.0.ebuild 1897 -RMD160 25f70b575377684de2cc82a670a3d82b9ee45a4e fuse-2.6.0.ebuild 1897 -SHA256 21fdccfce481397d8d4247adab93b29dc219933041b51ade7065af86690a33ed fuse-2.6.0.ebuild 1897 -EBUILD fuse-2.6.0_rc1.ebuild 1853 RMD160 274fa3ae72a0b26d7b3cff35e8a89e09b7d88544 SHA1 484d1546d46fa345b2be79ea6af5127bd239acfe SHA256 5b0a3f2009a74a5cd0f27c5ee2de1fd3d96ffd308d6871092a8572a1c250dd59 -MD5 2651e3fce08d95f7fbb553838de1f1b8 fuse-2.6.0_rc1.ebuild 1853 -RMD160 274fa3ae72a0b26d7b3cff35e8a89e09b7d88544 fuse-2.6.0_rc1.ebuild 1853 -SHA256 5b0a3f2009a74a5cd0f27c5ee2de1fd3d96ffd308d6871092a8572a1c250dd59 fuse-2.6.0_rc1.ebuild 1853 -EBUILD fuse-2.6.1.ebuild 2054 RMD160 dc04cf6c15ceace05bbe153b357cfa47bd859d59 SHA1 6b3f207b79e98afe60c7d592a9bfe2fa75500ce3 SHA256 b1484ff7af2c95a948d6e241aea5a1fce2206f874a95bf6894c69192ff696b14 -MD5 54cdf0a59d4707ac73574205f0277f0f fuse-2.6.1.ebuild 2054 -RMD160 dc04cf6c15ceace05bbe153b357cfa47bd859d59 fuse-2.6.1.ebuild 2054 -SHA256 b1484ff7af2c95a948d6e241aea5a1fce2206f874a95bf6894c69192ff696b14 fuse-2.6.1.ebuild 2054 -EBUILD fuse-2.6.3.ebuild 2019 RMD160 c2a5d7b60c031e92c183de6024b810e342a5a3d8 SHA1 a15862d2d23d02f742fc048c1f0f7960bfecae71 SHA256 8471dfe2fcb05909666d9d0aa556d1474011986116f70a1b96030b5df61b5bb6 -MD5 577bbd803cea63bc2779864c25dd97b6 fuse-2.6.3.ebuild 2019 -RMD160 c2a5d7b60c031e92c183de6024b810e342a5a3d8 fuse-2.6.3.ebuild 2019 -SHA256 8471dfe2fcb05909666d9d0aa556d1474011986116f70a1b96030b5df61b5bb6 fuse-2.6.3.ebuild 2019 -MISC ChangeLog 10808 RMD160 2bfb376cb13663c00fb39f5cf42ee13e73125e85 SHA1 b286a4223786df30676702b07c57854002586bee SHA256 6a1a26e19ea2c5df3165bd35b1a156154d177c2f8a7ee5e1351fc88c1ed0cb4a -MD5 8cc619803c253f42e61dcc8fb478b1c9 ChangeLog 10808 -RMD160 2bfb376cb13663c00fb39f5cf42ee13e73125e85 ChangeLog 10808 -SHA256 6a1a26e19ea2c5df3165bd35b1a156154d177c2f8a7ee5e1351fc88c1ed0cb4a ChangeLog 10808 +EBUILD fuse-2.6.0_rc1.ebuild 1993 RMD160 96f63ffb9adea86ba19dd2af784d27b2ad9bdf73 SHA1 150689f07a9be67665d57276b8dc1877c1837fb3 SHA256 51477f46c995ba769f8af855c56c6fbd08055d3af366ea776de347fd5bc79239 +MD5 e46e676f15bf20b102ec025919e693c1 fuse-2.6.0_rc1.ebuild 1993 +RMD160 96f63ffb9adea86ba19dd2af784d27b2ad9bdf73 fuse-2.6.0_rc1.ebuild 1993 +SHA256 51477f46c995ba769f8af855c56c6fbd08055d3af366ea776de347fd5bc79239 fuse-2.6.0_rc1.ebuild 1993 +EBUILD fuse-2.6.1.ebuild 2073 RMD160 4ea9b7246531daff230a360b67fe8acd17024778 SHA1 193a9e80a177fed0ba66a96a3dadb80a05074fe0 SHA256 42b800e09effb0be8c6365b46326e35e9460daec15322916168665349e58942f +MD5 b9d147a9327388d37e4a8a7bcb0ffe86 fuse-2.6.1.ebuild 2073 +RMD160 4ea9b7246531daff230a360b67fe8acd17024778 fuse-2.6.1.ebuild 2073 +SHA256 42b800e09effb0be8c6365b46326e35e9460daec15322916168665349e58942f fuse-2.6.1.ebuild 2073 +EBUILD fuse-2.6.3.ebuild 2036 RMD160 a7e7678f5fb66b085d14ace4ace2241f27c8ade4 SHA1 b4be760725a463d4b8392dbdf2a750cd88fb6be4 SHA256 5ba3d1f7d694cb4cac64760e122702f15919d875f81a3c7baf39a377a35babe0 +MD5 95bbca0e9caa3db2c947eb705e29ae5a fuse-2.6.3.ebuild 2036 +RMD160 a7e7678f5fb66b085d14ace4ace2241f27c8ade4 fuse-2.6.3.ebuild 2036 +SHA256 5ba3d1f7d694cb4cac64760e122702f15919d875f81a3c7baf39a377a35babe0 fuse-2.6.3.ebuild 2036 +MISC ChangeLog 10979 RMD160 d186903a2c51607d517a58f8066cbe9bd9b18676 SHA1 a9f1ce0083a2c4a422c8cbb0609aa082aa23c64d SHA256 6bf1ad8168bb4e37be344cdf6734903247466df05701bc0758eaa2acb12d6833 +MD5 a5ab46f0781e234e618f393afe2dd364 ChangeLog 10979 +RMD160 d186903a2c51607d517a58f8066cbe9bd9b18676 ChangeLog 10979 +SHA256 6bf1ad8168bb4e37be344cdf6734903247466df05701bc0758eaa2acb12d6833 ChangeLog 10979 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264 -MD5 da2d5d4493caf19f290f8bfc96432b80 files/digest-fuse-2.6.0 232 -RMD160 af595baf2649b777be0554ed328d2e79ae3e4599 files/digest-fuse-2.6.0 232 -SHA256 56edffce47d44250719ce334158efe40b4ee4a4db9f8d8da45e9651d6e09c888 files/digest-fuse-2.6.0 232 MD5 f76e56e89886676c8e018c5fb95bcf2b files/digest-fuse-2.6.0_rc1 244 RMD160 55efa5feb0276085043b7f9c26a7e7f7ffa34f00 files/digest-fuse-2.6.0_rc1 244 SHA256 eb1464bea0851975ce0444e4b684ef5fd9e9af05cbfe13c4ff557018a0f5ed5d files/digest-fuse-2.6.0_rc1 244 @@ -57,10 +46,3 @@ SHA256 e1bc84008f8176c0769fa99e8de7fc61bf291dab8173f792f9bcecb9bfd6fe4b files/di MD5 c7231e8a36c319190b7eb75b83f1ef40 files/digest-fuse-2.6.3 232 RMD160 c797934218623ae564318739ac3a3782e8885713 files/digest-fuse-2.6.3 232 SHA256 c8581faf6e90c4c6a181d6de1c8ead042654269af6313984fa00886db15cf9ed files/digest-fuse-2.6.3 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF28kKcsIHjyDViGQRAhBxAJ4g3BpFiuIoszDwbakaH788gJ0pYgCgwMh8 -ESt2Szy3J1+GJsCTxPEC+uw= -=0a5d ------END PGP SIGNATURE----- diff --git a/sys-fs/fuse/files/digest-fuse-2.6.0 b/sys-fs/fuse/files/digest-fuse-2.6.0 deleted file mode 100644 index 27259ddefd57..000000000000 --- a/sys-fs/fuse/files/digest-fuse-2.6.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fa6c7b07a0be3a3e30d6cf3a6bad5817 fuse-2.6.0.tar.gz 470514 -RMD160 bf36a008d17fbb1169bfd7d077a53587df90ddb4 fuse-2.6.0.tar.gz 470514 -SHA256 782137879b964139e2dc4767114b763cb0e11ae322476404920cf767728e659e fuse-2.6.0.tar.gz 470514 diff --git a/sys-fs/fuse/fuse-2.6.0.ebuild b/sys-fs/fuse/fuse-2.6.0.ebuild deleted file mode 100644 index 8904ac09da6c..000000000000 --- a/sys-fs/fuse/fuse-2.6.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.0.ebuild,v 1.2 2006/11/24 18:01:29 genstef Exp $ - -inherit linux-mod eutils libtool - -MY_P=${P/_/-} -DESCRIPTION="An interface for filesystems implemented in userspace." -HOMEPAGE="http://fuse.sourceforge.net" -SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="kernel_linux kernel_FreeBSD" -S=${WORKDIR}/${MY_P} -PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" - -MODULE_NAMES="fuse(fs:${S}/kernel)" -CONFIG_CHECK="@FUSE_FS:fuse" -BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} - fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs" -BUILD_TARGETS="all" -ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" -FUSE_FS_ERROR="We have detected FUSE already built into the kernel. -We will continue, but we wont build the module this time." - -pkg_setup() { - use kernel_linux && linux-mod_pkg_setup -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch - epatch "${FILESDIR}"/fuse-2.6.0_rc3-no-mknod.patch #152032 - elibtoolize -} - -src_compile() { - econf \ - --disable-kernel-module \ - --disable-example \ - || die "econf failed for fuse userland" - emake || die "emake failed" - - if use kernel_linux ; then - cd "${S}" - sed -i -e 's/.*depmod.*//g' kernel/Makefile.in - convert_to_m kernel/Makefile.in - linux-mod_src_compile - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog Filesystems README README-2.4 \ - README.NFS NEWS doc/how-fuse-works - docinto example - dodoc example/* - - if use kernel_linux ; then - linux-mod_src_install - else - insinto /usr/include/fuse - doins include/fuse_kernel.h - fi -} - -pkg_postinst() { - use kernel_linux && linux-mod_pkg_postinst -} diff --git a/sys-fs/fuse/fuse-2.6.0_rc1.ebuild b/sys-fs/fuse/fuse-2.6.0_rc1.ebuild index 7224093708d5..fc242398703c 100644 --- a/sys-fs/fuse/fuse-2.6.0_rc1.ebuild +++ b/sys-fs/fuse/fuse-2.6.0_rc1.ebuild @@ -1,6 +1,6 @@ -# 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/sys-fs/fuse/fuse-2.6.0_rc1.ebuild,v 1.7 2006/11/24 18:01:29 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.0_rc1.ebuild,v 1.8 2007/02/23 12:28:43 genstef Exp $ inherit linux-mod eutils libtool @@ -14,17 +14,22 @@ IUSE="kernel_linux kernel_FreeBSD" S=${WORKDIR}/${MY_P} PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" -MODULE_NAMES="fuse(fs:${S}/kernel)" -CONFIG_CHECK="@FUSE_FS:fuse" -BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} - fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs" -BUILD_TARGETS="all" -ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" -FUSE_FS_ERROR="We have detected FUSE already built into the kernel. -We will continue, but we wont build the module this time." - pkg_setup() { - use kernel_linux && linux-mod_pkg_setup + if use kernel_linux ; then + MODULE_NAMES="fuse(fs:${S}/kernel)" + CONFIG_CHECK="@FUSE_FS:fuse" + FUSE_FS_ERROR="We have detected FUSE already built into the kernel. + We will continue, but we wont build the module this time." + + linux-mod_pkg_setup + kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an + older version from viewcvs" + + BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} + fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" + BUILD_TARGETS="all" + ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" + fi } src_unpack() { diff --git a/sys-fs/fuse/fuse-2.6.1.ebuild b/sys-fs/fuse/fuse-2.6.1.ebuild index 739250823603..3ecf0c61e9f3 100644 --- a/sys-fs/fuse/fuse-2.6.1.ebuild +++ b/sys-fs/fuse/fuse-2.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.1.ebuild,v 1.8 2007/02/21 04:22:36 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.1.ebuild,v 1.9 2007/02/23 12:28:43 genstef Exp $ inherit linux-mod eutils libtool @@ -14,20 +14,21 @@ IUSE="kernel_linux kernel_FreeBSD" S=${WORKDIR}/${MY_P} PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" -MODULE_NAMES="fuse(fs:${S}/kernel)" -CONFIG_CHECK="@FUSE_FS:fuse" -BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} - fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" -BUILD_TARGETS="all" -ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" -FUSE_FS_ERROR="We have detected FUSE already built into the kernel. -We will continue, but we wont build the module this time." - pkg_setup() { if use kernel_linux ; then + MODULE_NAMES="fuse(fs:${S}/kernel)" + CONFIG_CHECK="@FUSE_FS:fuse" + FUSE_FS_ERROR="We have detected FUSE already built into the kernel. + We will continue, but we wont build the module this time." + linux-mod_pkg_setup kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an older version from viewcvs" + + BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} + fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" + BUILD_TARGETS="all" + ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" fi } diff --git a/sys-fs/fuse/fuse-2.6.3.ebuild b/sys-fs/fuse/fuse-2.6.3.ebuild index 4cdcad203016..bd62b1b4896e 100644 --- a/sys-fs/fuse/fuse-2.6.3.ebuild +++ b/sys-fs/fuse/fuse-2.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.3.ebuild,v 1.1 2007/02/07 16:47:30 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.3.ebuild,v 1.2 2007/02/23 12:28:43 genstef Exp $ inherit linux-mod eutils libtool @@ -14,20 +14,21 @@ IUSE="kernel_linux kernel_FreeBSD" S=${WORKDIR}/${MY_P} PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" -MODULE_NAMES="fuse(fs:${S}/kernel)" -CONFIG_CHECK="@FUSE_FS:fuse" -BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} - fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" -BUILD_TARGETS="all" -ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" -FUSE_FS_ERROR="We have detected FUSE already built into the kernel. -We will continue, but we wont build the module this time." - pkg_setup() { if use kernel_linux ; then + MODULE_NAMES="fuse(fs:${S}/kernel)" + CONFIG_CHECK="@FUSE_FS:fuse" + FUSE_FS_ERROR="We have detected FUSE already built into the kernel. + We will continue, but we wont build the module this time." + linux-mod_pkg_setup kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an older version from viewcvs" + + BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} + fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs" + BUILD_TARGETS="all" + ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}" fi }