From c839110e72105629c85e121fc7c7d5b06a3093a4 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 28 Dec 2017 12:29:58 -0500 Subject: [PATCH] squashmirror: Add dep on sys-fs/squashfs-tools. If you are installing squashmirror you presumably would like it to actually work. Clean up old versions. --- app-portage/squashmirror/Manifest | 4 +--- .../squashmirror/squashmirror-20150926.ebuild | 23 ------------------- ...ebuild => squashmirror-20161005-r1.ebuild} | 7 ++++-- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 app-portage/squashmirror/squashmirror-20150926.ebuild rename app-portage/squashmirror/{squashmirror-20161005.ebuild => squashmirror-20161005-r1.ebuild} (80%) diff --git a/app-portage/squashmirror/Manifest b/app-portage/squashmirror/Manifest index b548f41..bc9946e 100644 --- a/app-portage/squashmirror/Manifest +++ b/app-portage/squashmirror/Manifest @@ -1,4 +1,2 @@ -DIST 6a2e8e8c5880fa7f35ef90fbfeea8dfbbfc048a1.tar.xz 8340 SHA256 0237658248070617ebf637bf637b7a7cec2bf9a245af5f75b79ae2374444b896 SHA512 e2544e34dfc0869a7d26ba305adf71f33e926f48ed8a928c86e49a779b216a62305f7e076c27bad4b3bc328e3223da8d215561712c1d2992fe8d4b8d14c7a93d WHIRLPOOL 3481e8449bddcfbe582cbb9326a7c820e6280e199af0b60e4654eefd6454a8968e86355a3b958781fc2d1f667eb53d27b7bb1b8d8ed3b5e083c40dbb139a4baa DIST f419e6e863af2c87773b829fb5e8ef09797a620a.tar.xz 8340 SHA256 847abd9c8217f9172b763b9c1912e20bf25eb737221f047b7c28a5e715ce133b SHA512 c78322e0fc677d69d6308a845de955d9c1c167b89af1736277cc92bddc9073b0ea1c3eebc4d4260cee53a8b512cbdf53b8e4027f966336fff78e3e4a9e28539d WHIRLPOOL 2fd2511af89eee1651f1a53a7233d3ec42a8e7d6baa1545182e8f93bdceb8153a8b6e0d97c0b622d498f28750e32f235fe4daed44a1677f4d30a95b19a445fc4 -EBUILD squashmirror-20150926.ebuild 603 SHA256 2df4ba2c98c1441c77aefb67ceb31a617c02920984d9f5a381d1f0a5903cc017 SHA512 17561750127fdfd45cac81256e9cb1383a4fb89dc95d35f28517072ca4fafca8e02c8f0cac9ea4fa7d97514674e2c63dfec975503b8de086b7bcda6959ea1455 WHIRLPOOL eb165b3b6e469e0c4c0ee28993402ab1dbc0600a165a38d5db29886f606205dc8ecfbd670680b81644df7eadf27cd7053296371a105d7c8e424efe13cd7daa82 -EBUILD squashmirror-20161005.ebuild 603 SHA256 6fa05e103ad4cc3d7404b470a3cd0364535018e812bf3ee8a9066b1630e3594c SHA512 2736cc8a3686ecd3b98c78c09bc25d3089d9e0b171defedcca76c5f9ba2ad4bfabb9a7601719f93ed1461df5c655c0531e259b340bd879289f4fba7412172fde WHIRLPOOL 5834ab760cf58221a21fa41ba13d8ef315c49c0ef931782438aa4b75ce2ad17cff96edd1d21a60dacdc9000f7fe8e30ac63349253c1ffb7ee38bb0cc6ddcd6da +EBUILD squashmirror-20161005-r1.ebuild 660 SHA256 d55b2c9c75c53ece1a27f412b4028bb6c534bb2ac78e3e073f74e4b73a28b9dc SHA512 c0f48f92e0728acab0b9751e64ef9e6fe068ea57896707ece8e04c4bdae0a792963585ce5c1d8dacaea7fb78c4f255a7a00551bd3b771182a85d31cc593fcf59 WHIRLPOOL 6326067ff78404a611fc1afb920c4535f2b76eda3fcc6b97328be4480d92cd303131c8215875022c5bfe92cb7f74c69c84d68a777bd4051b0036e6d6e04834e1 diff --git a/app-portage/squashmirror/squashmirror-20150926.ebuild b/app-portage/squashmirror/squashmirror-20150926.ebuild deleted file mode 100644 index 1d32e77..0000000 --- a/app-portage/squashmirror/squashmirror-20150926.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright © 2015-2017 Nick Bowler -# License GPLv3+: GNU General Public License version 3 or later. -# There is NO WARRANTY, to the extent permitted by law. - -EAPI=5 - -PYTHON_COMPAT=( python3_4 python3_5 ) -inherit distutils-r1 - -SHA1=6a2e8e8c5880fa7f35ef90fbfeea8dfbbfc048a1 - -DESCRIPTION="Portage sync module to generate squashfs repository filesystems" -SRC_URI="http://git.draconx.ca/gitweb/squashmirror.git/snapshot/$SHA1.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=">=sys-apps/portage-2.2.21[$PYTHON_USEDEP]" -DEPEND="$RDEPEND - dev-python/setuptools[$PYTHON_USEDEP]" - -S=$WORKDIR/$SHA1 diff --git a/app-portage/squashmirror/squashmirror-20161005.ebuild b/app-portage/squashmirror/squashmirror-20161005-r1.ebuild similarity index 80% rename from app-portage/squashmirror/squashmirror-20161005.ebuild rename to app-portage/squashmirror/squashmirror-20161005-r1.ebuild index 7f0a413..b1c6c6d 100644 --- a/app-portage/squashmirror/squashmirror-20161005.ebuild +++ b/app-portage/squashmirror/squashmirror-20161005-r1.ebuild @@ -16,8 +16,11 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64" -RDEPEND=">=sys-apps/portage-2.2.21[$PYTHON_USEDEP]" -DEPEND="$RDEPEND +COMMON_DEPS=">=sys-apps/portage-2.2.21[$PYTHON_USEDEP]" + +RDEPEND="$COMMON_DEPS + sys-fs/squashfs-tools:0" +DEPEND="$COMMON_DEPS dev-python/setuptools[$PYTHON_USEDEP]" S=$WORKDIR/$SHA1 -- 2.43.0