diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild similarity index 94% rename from sys-fs/zfs/zfs-0.8.6.ebuild rename to sys-fs/zfs/zfs-0.8.6-r1.ebuild index b3237b1433066..ac6c6017eaaf2 100644 --- a/sys-fs/zfs/zfs-0.8.6.ebuild +++ b/sys-fs/zfs/zfs-0.8.6-r1.ebuild @@ -22,15 +22,15 @@ fi LICENSE="BSD-2 CDDL MIT" SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc[static-libs?] - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] + net-libs/libtirpc + sys-apps/util-linux + sys-libs/zlib virtual/awk - virtual/libudev[static-libs(-)?] - dev-libs/openssl:0=[static-libs?] + virtual/libudev:= + dev-libs/openssl:0= !minimal? ( ${PYTHON_DEPS} ) python? ( virtual/python-cffi[${PYTHON_USEDEP}] @@ -154,7 +154,7 @@ src_configure() { $(use_enable debug) $(use_enable nls) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -177,9 +177,7 @@ src_install() { use test-suite || rm -rf "${ED}/usr/share/zfs" - if ! use static-libs; then - find "${ED}/" -name '*.la' -delete || die - fi + find "${ED}/" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5-r1.ebuild similarity index 96% rename from sys-fs/zfs/zfs-2.0.5.ebuild rename to sys-fs/zfs/zfs-2.0.5-r1.ebuild index 67d297759f107..6b91c6f5b8160 100644 --- a/sys-fs/zfs/zfs-2.0.5.ebuild +++ b/sys-fs/zfs/zfs-2.0.5-r1.ebuild @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/4" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc[static-libs?] - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/libudev[static-libs(-)?] - dev-libs/openssl:0=[static-libs?] + net-libs/libtirpc + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:0= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -202,7 +202,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -227,9 +227,7 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool diff --git a/sys-fs/zfs/zfs-2.1.0.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild similarity index 96% rename from sys-fs/zfs/zfs-2.1.0.ebuild rename to sys-fs/zfs/zfs-2.1.0-r1.ebuild index 81159a7d8e25f..9f8ac5af22074 100644 --- a/sys-fs/zfs/zfs-2.1.0.ebuild +++ b/sys-fs/zfs/zfs-2.1.0-r1.ebuild @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc[static-libs?] - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/libudev[static-libs(-)?] - dev-libs/openssl:0=[static-libs?] + net-libs/libtirpc + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:0= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -199,7 +199,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -224,9 +224,7 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 22e4286a86541..c089c475f30c7 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc[static-libs?] - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/libudev[static-libs(-)?] - dev-libs/openssl:0=[static-libs?] + net-libs/libtirpc + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:0= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -201,7 +201,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -226,9 +226,7 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool