Drop r6 (build failure with swig, fixed in r7)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index f1e096427cfa3c315c07a935a867ea6772f71d95..823b919d77af086f7f81188b26a436be84df1713 100644 (file)
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/setools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.96 2015/02/18 03:35:21 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.97 2015/03/02 14:07:07 swift Exp $
+
+  02 Mar 2015; Sven Vermeulen <swift@gentoo.org> -setools-3.3.8-r6.ebuild:
+  Drop r6 (build failure with swig, fixed in r7)
 
   18 Feb 2015; Jason Zaman <perfinion@gentoo.org> setools-3.3.8-r7.ebuild:
   re-add keywords to -r7

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 8ea16864584663a78514e41029bbecf749cf0fdc..cf1cc0955fc7976de72abe1ff0582d79afb5e46f 100644 (file)
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -9,26 +9,23 @@ DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148c
 DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
 EBUILD setools-3.3.8-r5.ebuild 4556 SHA256 5c050294face07b984e68334867961fb5ae595517c26ba7b46baa7bc1a98e444 SHA512 4ed547cd0d97b53dc7f798a967780ffde9cda669402dd46f12bb1862092c51c3a6be6415fe8fc03f4d48d19c2f684a0169d92002689a977eda5c3f165597725e WHIRLPOOL b95f4c9973ab5826a43e06cb460b477c6135a2775a86fbd71bfb9d3696ba33d7606afea7d93235b381e2d7b0bf1340ce42fae94fa810cf1ff550d14ae42ffe6d
-EBUILD setools-3.3.8-r6.ebuild 4636 SHA256 dd353ab4dea6c3ad3a0ab21260771a3817aefc8228690818e7a63b4c903085cc SHA512 7bd3728bc02d0756c22318c6878801ad846a035bd2140491d38faa9e3a9bc827c1845d6dd2fe5f6d48911b7be80629e76b680a712a2c18603f5e2aa474b3cef1 WHIRLPOOL 2e1eb142fd528a4c48ac99a583918aa7dcef4b7e4d448c3c02b5b26e8a1c82b5411b5901cdf857dad268ceb93b578700db314af22caf07425af47b73e38e721d
 EBUILD setools-3.3.8-r7.ebuild 3828 SHA256 d56c10da5be9e647acfaf6afd4238075f98ac90952dcc3db8361643d8850a25b SHA512 4869c74e46faf56359de1cbe2abe17ec16ec2d19975ffbc5d2f651a79a0fa76cd6ae5bfd86a857d1bfbe717e7b5a8b6c34e05254d0604a7dee36b2795184ab0c WHIRLPOOL 75ea0315aad2ca088661025aff1ebb5d9e322c987c74f805c2b26606f629024217c556951aebd91b55b45699ed8760c3d8f16c9bde53cc74e37e6625ff3edd1a
-MISC ChangeLog 13157 SHA256 39e08229e44e5ed8b714d08e2e5f7615110e5b34140db0d424e37c7bbd271354 SHA512 a8d41190821f064312c0f37f80ccaaf8ace5301006ae5bcbf8e1363f235a93bd25a6251e4d3b39e75f298fc137513aa5ee5d3929f7f885ebc61922d50d000778 WHIRLPOOL 9edd21cbed3f1356ce34869faad178f86e45c2fd06c2addba7803f0ba4955c186e3f20dc005a71948060db995fb9ad94ba66c58be9f0c2d52c5e30a123e71e64
+MISC ChangeLog 13278 SHA256 03d00598f8aec69571e4ba89998871609797db056555a7abe0b09a94c59ea929 SHA512 4d07a53f4ec22c9cdd1f023f103e2c561aa6b1755560d8fdd219108c2e65443a032d00b04005b1399e714effef3ab9c9c9216fc2ebd5cf822d4cd076069a05df WHIRLPOOL e71c65988507f34bb0deea12b772ee1d4752668a82397fe9c07192e8d73949a78bbf1a2875e2d264564617b85b76b563d361a20db8c6232b0015191f32a7ddce
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU5Ah+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VWmcP/RK0Uz8sg/nhK/Mipqrs4/Rd
-JfdR5RYYgz8TpttWsWEbn4TUAfW9qBsKoy2aPgf+EuaxR2YOXL+BLYxOr4DhnyIx
-9XIep9SC7u09Ylt+jZzIWKuWVVrlgkHoNnHw4J+LhDXFZ/ROfJUbZiLmeA2WW8EI
-3RyHEBiAdvxqQg7ECmui7eqz8XpueEjsHDjVmQOkXdO1zzlASUFeZ2SyPvKyqOof
-SvH/FKpeavCgrAUKK8dagW4sK87/ioYDC44c/yxpzDgUCeaALqf0ShiLRwrF2c+b
-VWFrFrv6yjd2Q7GKTC2QKLunRjKa2ra7HFHnYaEUm7yBo1oy6TPiTaP2/WrqQKNH
-eCcBoXgOY8jqzesOL7tjr1CGFKYaoKrUrcjqGPoBbGlAlYpt4E+Qq+0dcMtLcNdi
-URvDoc5n9JYEBn6nwB9eS+YFdEVqQl1XEQeV7rIgnqeO3UJbaXPjxffWnZbfdVOD
-TBjgdHNid3NFG/nzIez0a59BFaWUHuxNIVZDjW6yg7lFjQnBVV8pgh4NgEFGNke7
-fStcti8agqX8GkUar/JuNdB9roNvPRFl+Q99vzoyGMSv/tH4s2eO28eCT/1NXyAX
-d/vNTqza10MCxhUARz9mk9CVvOFoJ+P9HKgbKOSXNBoZe1U0z6fEdDuo5P8Hd5I5
-nrrtL2eE2T2bVxHExh42
-=SMkY
+iQIcBAEBCAAGBQJU9G6OAAoJEC7dUkA7aK9Hz04P/3hLRxQr1QsiItX8P1W2wAfh
+PjApd9aI98A/nEKV17xSBkpbdw5c5ZjIhPMVWoNgJ80iAnJPVWnlSmFlrspDFR50
+D6DxhVbtwQoGdIPfDJ+mPU+I1QrbH6L3v0SExPZx+CaNLl5qhzMUBMWDPHw/VbJ/
+4ybRb4llWILFyfa9tig+wOWrN9JYHTs/+nGWGac58yFf7zEFPMgfUG2HcUN4PVs3
+bV/8VlXeUykw+7aDp10LTTqLGqzhU85WkilWy9fOqei+dN3t4Yet7Vurrv+Hd14U
+6gcuFwNdvuDdmwbGsBo4M/AKseYXdOmVAYRQRx01sKrpr+SLF6VNiudGXSlAIKtl
+GhvoB0kPSHvbp1uxqUhs29vvcJa/0oHg0e6RDphV0IT/rjmSwB+WxUkMeZpEuDhq
+/aGoES7g1XxVZ8TqmczOcWWr3EFEca4QqPQdKYUBCgxQuSqzhiAEgjsNPbiD4mCC
+pVx2YKZ9HWNthYCCJo0a9GRCsEAqJ0QqdGZTT72fFiuPnMeSATCbG14yiXq+6dQ2
+lrsTYH3NtLCuuZctKHm8OBoR8qkBH7OzeLEXs+W0t11IPT6HIAwlYTW3RoL7jBZU
+ySV0BpyoWdsOxRJTiz04cM6uOlFIqlkSLbRnxsvqg+pnrhQWgfSlGmQxqh0qtneX
+Ns0m30WigY67fLU7LlQn
+=srsS
 -----END PGP SIGNATURE-----

diff --git a/app-admin/setools/setools-3.3.8-r6.ebuild b/app-admin/setools/setools-3.3.8-r6.ebuild
deleted file mode 100644 (file)
index 3b3be06..0000000
--- a/app-admin/setools/setools-3.3.8-r6.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r6.ebuild,v 1.1 2015/02/12 18:04:48 perfinion Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools java-pkg-opt-2 python-r1 eutils
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
-       http://dev.gentoo.org/~swift/patches/setools/${P}-01-fedora-patches.tar.gz
-       http://dev.gentoo.org/~swift/patches/setools/${P}-03-gentoo-patches.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X debug java python"
-
-DEPEND=">=sys-devel/automake-1.12.1
-       >=sys-libs/libsepol-2.4
-       >=sys-libs/libselinux-2.4
-       sys-devel/bison
-       sys-devel/flex
-       >=dev-db/sqlite-3.2:3
-       dev-libs/libxml2:2
-       virtual/pkgconfig
-       java? (
-               dev-lang/swig:1
-               >=virtual/jdk-1.4
-       )
-       python? (
-               ${PYTHON_DEPS}
-               dev-lang/swig:1
-       )
-       X? (
-               >=dev-lang/tk-8.4.9
-               >=gnome-base/libglade-2.0
-               >=x11-libs/gtk+-2.8:2
-       )"
-
-RDEPEND=">=sys-libs/libsepol-2.1.4
-       >=sys-libs/libselinux-2.3
-       >=dev-db/sqlite-3.2:3
-       dev-libs/libxml2:2
-       java? ( >=virtual/jre-1.4 )
-       X? (
-               >=dev-lang/tk-8.4.9
-               >=dev-tcltk/bwidget-1.8
-               >=gnome-base/libglade-2.0
-               >=x11-libs/gtk+-2.8:2
-       )"
-
-RESTRICT="test"
-# setools dirs that contain python code to build
-PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
-
-pkg_setup() {
-       local myld=$(tc-getLD)
-
-       if use java; then
-               java-pkg-opt-2_pkg_setup
-       fi
-
-       ${myld} -v | grep -q "GNU gold" && \
-       ewarn "Bug #467136 shows us that the gold linker doesn't work with setools for now."
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/setools3-userspace-2.4-compatibility.patch"
-
-       EPATCH_MULTI_MSG="Applying various (Fedora-provided) setools fixes... " \
-       EPATCH_SUFFIX="patch" \
-       EPATCH_SOURCE="${WORKDIR}" \
-       EPATCH_FORCE="yes" \
-       epatch
-
-       EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
-       EPATCH_SUFFIX="patch" \
-       EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-       EPATCH_EXCLUDE="0010-fix-lsetfilecon_raw-call-bug-509532.patch 0005-update-on-py_functions-for-python3.patch" \
-       EPATCH_FORCE="yes" \
-       epatch
-
-       # Disable broken check for SWIG version.
-       sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
-       # Use swig1.3
-       sed -e 's/AC_PATH_PROG(\[SWIG\],\[swig\])/AC_PATH_PROG([SWIG],[swig1.3])/' -i m4/ac_pkg_swig.m4 || die "failed to set swig1.3"
-       # Fix build failure due to double __init__.py installation
-       sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
-
-       local dir
-       for dir in ${PYTHON_DIRS}; do
-               # Python bindings are built/installed manually.
-               sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
-               # Make PYTHON_LDFLAGS replaceable during running `make`.
-               sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
-       done
-
-       # bug #424581, Need to use MKDIR_P for automake 1.12+.
-       find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} +  || die;
-
-       eautoreconf
-
-       # Disable byte-compilation of Python modules.
-       echo '#!/bin/sh' > py-compile
-
-       epatch_user
-}
-
-src_configure() {
-       econf \
-               --with-java-prefix=${JAVA_HOME} \
-               --disable-selinux-check \
-               --disable-bwidget-check \
-               $(use_enable python swig-python) \
-               $(use_enable java swig-java) \
-               $(use_enable X swig-tcl) \
-               $(use_enable X gui) \
-               $(use_enable debug)
-
-       # work around swig c99 issues.  it does not require
-       # c99 anyway.
-       sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
-}
-
-src_compile() {
-       emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
-
-       if use python; then
-               building() {
-                       python_export PYTHON_INCLUDEDIR
-                       python_export PYTHON_SITEDIR
-                       python_export PYTHON_LIBS
-                       emake LD="$(tc-getLD).bfd" \
-                               SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
-                               PYTHON_LDFLAGS="${PYTHON_LIBS}" \
-                               pyexecdir="${PYTHON_SITEDIR}" \
-                               pythondir="${PYTHON_SITEDIR}" \
-                               -C ${1};
-               }
-               local dir
-               for dir in ${PYTHON_DIRS}; do
-                       python_foreach_impl building ${dir};
-               done
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       if use python; then
-               installation() {
-                       python_export PYTHON_SITEDIR
-                       emake DESTDIR="${D}" \
-                               pyexecdir="${PYTHON_SITEDIR}" \
-                               pythondir="${PYTHON_SITEDIR}" \
-                               -C ${1} install
-               }
-
-               local dir
-               for dir in ${PYTHON_DIRS}; do
-                       python_foreach_impl installation ${dir};
-               done
-       fi
-}