Cleanup deps

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

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 4db6126b6f05fd3bd3d0d8ea33ce1fdc49629e54..120f55e19f4f2aa1b45f4741b77c16260ccec97b 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.99 2015/03/16 21:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.100 2015/04/18 22:02:57 perfinion Exp $
+
+  18 Apr 2015; Jason Zaman <perfinion@gentoo.org> setools-3.3.8-r7.ebuild:
+  Cleanup deps
 
   16 Mar 2015; Mike Frysinger <vapier@gentoo.org> setools-3.3.8-r5.ebuild,
   setools-3.3.8-r7.ebuild:

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 3bca9e3e7f4a773d27e3dc5424778bf96364df0e..e3a94c53b5eb458de8a213f356eb5b2189631a21 100644 (file)
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -9,23 +9,25 @@ 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 4345 SHA256 e16a7cc8e89e45c2760c8b5576e5955eaf44a07512269e48fb9bc4a0727b42b7 SHA512 4df946c6697454c9c6044b394a5e5d65449d572c6461d3aa06a5c20ae07cdb36ef3b2475c7eb81ea8a913663dbbda43afe2aaf67eecf64f29da9730105571191 WHIRLPOOL af5f526222a845ea59ca00e97f4f02d31e6facc52979279ae9ba36f60cf5ce7123a695c34eb9c8513f04c014df27cdb9d672f01f835f95eb8c9978cf2d8daa67
-EBUILD setools-3.3.8-r7.ebuild 3749 SHA256 730a5c2fa7f6ac3ed86f0447e85aa4cbcff100a0e1c8fed232699657b3be81fd SHA512 4fa31f0579c829fb312519d8d898984c749aee82230e10c1b318c250b56f5339be1b2605af4709570c5fe537728ab29958aa8ddff8e9748cf6b05eccb70f6b8d WHIRLPOOL 2c14b1a384ce0b29c84711873b620bbf4acd644190e8fc88ef42c611b0136e4b67cf7d562dcd2c830aa2fd115d12f13339f370d1302877fab6fbb525432ba396
-MISC ChangeLog 13649 SHA256 a085bb4def98c27a356790793b6b173449141291ec2d2b87d6484626ae3afd94 SHA512 62379f4de54e093fbacceda0080abebe10e52dbf2e1b22f88f098dc2e658883940be1ed09dfe37b22633207bbd9a8b5abd7ca620cf5c14d3d8bad536b0bfcf6d WHIRLPOOL 547d786c9d4f60451152bf1f4e45d0dbb6b3237cebb55457fdc61ab3b58532dd1853cd107208474ee8eddd530c51f8f33068fccb21db38ce721ddfaf442114f7
+EBUILD setools-3.3.8-r7.ebuild 3612 SHA256 8f863e7b67302e6f529be230971a2a5c6de43f433d71dad94536acf4409c975b SHA512 c798e347cf033180e3c3e59db3bb62f6ac4218be63faedfee30da4c9ec0b2426ade60d955d818fa78ea6c1546974e1e9b397ffdfb291ae5de912c1b04316bc53 WHIRLPOOL fce803c9c170e0b268f6cb586043f564cedcfcdebeffcc14cb8ad2fee0fa2b53afe0cde6387f407780d825be048c9ea6188e916935c570ff867de57a6322e414
+MISC ChangeLog 13744 SHA256 89adc2d201a38938de81322e93d505e6b91c4902ce112236b44f797557e0f4af SHA512 735b340e60d357860c417c8c1ce849a5543b5a3e3952630e2d7410037dfdd2aa2767b4f6a2623503b20720acc199c0b74f4800834db407e413efb1265436432a WHIRLPOOL 5e34c18a519b816b8c990acd69c1af2ffe693a17a73a6d33234f7f5386ce1cac397029470d89fd288edfa53808eb5b52c2af2f969b003cf6ebb2cdcb2c9b809a
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVB0xOAAoJEPGu1DbS6WIADdkQAIGjjKq2UWEiS46zJuSBwca3
-KX+ixOE3ejV+d30OzKsr1R4YvxL05QdujQ1uvrFiiXzmFIQgJbz0CBWnRDuM0aA3
-irhMdQ14/qu11+sq8o4YKnzxdHZQDjDAZt560/V70reH+9qC+my2Ny5oWpngvEBN
-XdDUquamW60iWScDaGkmX2StEUJnl41NS4MqzuKJ6pyutq47f23kDb4jpacszqQu
-FCmOU2gemnroVPch+UdqapFgqyp4ngwXBGYb9UdWn84gF7Rg7RpHD8YKMkFUtRQj
-OJytSl/fgRlmypGh5xJcIberV1kgTD002XfkN8zbtue0FphANb8w1IKx0y+E20JI
-r9wR05KVsqTUQDa06+xUuOPTSO0mCaMcnFrPHKCBZBp9ZgshRyZpy9DgYFMCnaHT
-mJpV8Ke6He2bAAjagHYh2DcSxGYUo6GzuKcgGPnsBT0YaYtPFDNX3M/t47WlFF3h
-lMQiXHkqHEZT4inZdCtvaeTR56UIxjHfF2vt5SvGbNsZEBe/KGp4gcVAWj/gZK5c
-bgkvzbK4JN3DJz+XNBzsRYAOoXdatRVlUH176ZHzswBUtiNZUzQCkuN1veof5FTY
-pf57JyPaQyNc5/ghoW76vfIhHIKmKapt/+MK78KUAx1y6UbijU+81NWssV7RLZf0
-OllvJu0h+1u77xwsd2qa
-=hpe4
+iQJ8BAEBCABmBQJVMtSSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V7P0P/2jPNmxNX9KNs/pEOekm1ll5
+7e3qZzdxMoYTaNIupb2F4NwFY8n2saiKR/WfYTveasiOkAHzKBkd9ZGvpGSeJyAh
+9MoWYuxuxCYEiOWPT/Et783gxeiUOsqE5H92+oUD61/Cu5g9lYkNutzYDSGWNgID
+DvAb+LnV1vhSUm6Fe8NELTEcmaIopFeQI6eI7/YS/vOq0zPvrpUcH17O2CgdKs7Z
+n2YheTSfVJTXG0D6IPP7M4IXuMdskWHPQebsOLc18SnTAbHxkFvNUyea4WYpgaVj
+Kd1bd9GpIStexqZV7uhnBXSc//YWIwfuN3K3EHCV6zADHLJW2BV5gq8Bg9ubAhX8
+s2CKia4xgvzuSrp64NqWuobG2WFwN8cRh3T2RXKxqslxJ4XZANLtp3sx8/IqjrsN
+tOD0EwNpuZP7kmdkcdI39jfr8US3Iq/Rr/4VfpnVNFRXrYKGcapPtmJmi4tLCONg
+fNQhIPslgCmieuvIvigC0kJwAiC47L0V6H1ay/aKQKDWMdCXmbsyVPZ5eOkIhzuQ
+nPWacAH7dY5QQxDbeJJc5iQsYPz0dCIROB59iFEsV2eTau8QKhUDz36hsuqcAmhm
+cSKceXyE4JWagnzOIxrIAIOlDjPwMtsMpFqoOtamNCBfZUPx5uh/ch0e3eqJkYrp
+zHZqOFsHpV/GXpoSrn2N
+=D4xF
 -----END PGP SIGNATURE-----

diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
index 50b1f37f767f8c8745708b67383635e2c70cd64c..7ec89d5fc68a2a010f73f22b745266491e19a2c4 100644 (file)
--- a/app-admin/setools/setools-3.3.8-r7.ebuild
+++ b/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -1,6 +1,6 @@
 # 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-r7.ebuild,v 1.4 2015/03/16 21:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.5 2015/04/18 22:02:57 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_4 )
@@ -17,40 +17,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X debug java python"
 
-DEPEND=">=sys-devel/automake-1.12.1
-       >=sys-libs/libsepol-2.4
+COMMONDEPEND=">=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? (
-               >=virtual/jdk-1.4
-               dev-lang/swig
-       )
-       python? (
-               ${PYTHON_DEPS}
-               dev-lang/swig
-       )
-       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 )
+       python? ( ${PYTHON_DEPS} )
        X? (
                >=dev-lang/tk-8.4.9
-               >=dev-tcltk/bwidget-1.8
                >=gnome-base/libglade-2.0
                >=x11-libs/gtk+-2.8:2
        )"
 
+DEPEND="${COMMONDEPEND}
+       >=sys-devel/automake-1.12.1
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+       java? ( dev-lang/swig )
+       python? ( dev-lang/swig )"
+
+RDEPEND="${COMMONDEPEND}
+       X? ( >=dev-tcltk/bwidget-1.8 )"
+
 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"