From: Alon Bar-Lev Date: Thu, 25 Dec 2014 11:03:56 +0000 (+0000) Subject: Version bump, fix bug#533482, bug#533484, cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aacc96141b0910f514a8f5678604b57a2f038811;p=gentoo.git Version bump, fix bug#533482, bug#533484, cleanup Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xBF20DC51 --- diff --git a/app-arch/createrepo/ChangeLog b/app-arch/createrepo/ChangeLog index d052f29c5d4f..7f720f33480f 100644 --- a/app-arch/createrepo/ChangeLog +++ b/app-arch/createrepo/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/createrepo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/ChangeLog,v 1.7 2014/12/25 00:28:11 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/ChangeLog,v 1.8 2014/12/25 11:03:49 alonbl Exp $ + +*createrepo-0.10.3 (25 Dec 2014) + + 25 Dec 2014; Alon Bar-Lev +createrepo-0.10.3.ebuild, + -createrepo-0.9.9-r1.ebuild, -createrepo-0.9.9.ebuild, + -files/createrepo-0.9.9-ten-changelog-limit.patch: + Version bump, fix bug#533482, bug#533484, cleanup *createrepo-0.9.9-r1 (25 Dec 2014) diff --git a/app-arch/createrepo/Manifest b/app-arch/createrepo/Manifest index a0e87f4cb23c..033e7f24143b 100644 --- a/app-arch/createrepo/Manifest +++ b/app-arch/createrepo/Manifest @@ -1,29 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX createrepo-0.9.9-ten-changelog-limit.patch 522 SHA256 2fcc3477c468d4dbc5f4372ac8d2c08f379876c9b48e9662d74d94251dff59d0 SHA512 0afbf7a668952f3e51773e219e5381aeae5ceab4bf38a75f77232be7d4923d3515e4c6c04a41b4293ea693a91d2af59624e88716ccceb0b472f0a638331f205a WHIRLPOOL ceda605447a020e75f3fbf440c4696c05a5952ce485c06faf896eb1227e3297a829bdb4b761f4688fc1ef6765b3f9963b789cd2b310555cd0d1078216de62a63 +DIST createrepo-0.10.3.tar.gz 66004 SHA256 cd54621bef94c4a5ebffb5f19382050452d3e69763d2db4121c5d3881509ea6d SHA512 9e56625361dbc54667b42a4a8e84f46fd80dcb8d92ec9ff8532107981550612f946438061cc00b14c02f45aad18b33085bb0511a200715ba6d7c019785604a6e WHIRLPOOL 35de55956d7a69d6e7e5a32753336fc7808101330bb635e0712a06a76f7c5bd506b7cbaf0c728c099afe6a5927ad315e26ef44ce5cb57f6a9bb512dcf0af78df DIST createrepo-0.9.9-head.patch.bz2 14380 SHA256 74bdaea63c5f72d8814b0be5bc4b497188c8bd7c10fc3d66b6fd4058f98b58b8 SHA512 6d5e970e1489cef85cebedc3805bb1496c743c361b9bdda3d8df290f8e588d7d960272cf3c18e9c48fcdaf6a003b784a87aaea218da1ad68bf77446600980554 WHIRLPOOL 571319be8e0a7a559aa941046ea098e197f539d5156df12f3ac5ad87b133dbd7fc844ad208b7163110f8393a06eeb5c3a2fca2d09c870b3b59f457c6cb52634a -DIST createrepo-0.9.9.tar.gz 65114 SHA256 ee897463837b299fb20bf6e970f8c5324cd8b7f26ad3675a9938a2d7ae42ff03 SHA512 144937cd272690f1a045817e795612ad613c9f106e0f647e77159bf1c771493c2ab161d173b0f8f03c1f555a64259156df8694f2d169c30c74e9a4131775e44f WHIRLPOOL 963b28a7bfd8c10e294d28f2b86341b6fc4d081d547593c227de09a4295cb7a1500e9ae856a568593db6f46c0441b1ddd79260ce406bb8278c0328a2b612f759 -EBUILD createrepo-0.9.9-r1.ebuild 1260 SHA256 565541ab2645c949afa273cb9a6574d7cdb5e440a6193d68d4ec1a5ede1ad62b SHA512 b90ea74df6825dc5c518a260c0ace833be5cbee77a9b3a06f89e485fd33b40df6b62a00e3624e4767868575fb11ef5f9a2d733ba449e7517fa992c860492e3db WHIRLPOOL 1b1ac85addb4d4f78c89434557dd4b20c2fa8f95c3e47b4d738ce65699ab4a8a66605547ced8bd9e6b37ee3395e8cdd344080a63519cb5dd03ae39be481cc19d -EBUILD createrepo-0.9.9.ebuild 1148 SHA256 b2cfac06ab0e1da7f8671372a6aa8c1dfc7769c4d6ecf93e17ad0351532cf04a SHA512 8aaa6002f0597209fa270db2dee13afacc6a3e2c087a3b4ee9856e062c4763f922afd82492bf4d74103879c1f3c927a15388ba06c44f542751bc2fa962f02801 WHIRLPOOL 31cc9cfa1bc491bb0fb9ef7b59ea2baba644f97433dacaeac4541c09e7772c0394e66bbfb0a2336e757b0dcf14c53f27d09e63c5299f7a4272c813885055719b -MISC ChangeLog 1625 SHA256 07aaadaae80d96f4ea12acc85053f906e076601ce7aa6230d410f3304de6ad93 SHA512 f60142fff02c8eb170e6d5effa69f52695892fba20c008a32718fa1317689b810e8f0abd27dbde4a2542a1423d9064f3c437415015c12c1c7d92eb55e31d763f WHIRLPOOL 3be99b0f5af82dc5b14a375e048c668e9e8c8b3384fc27a3d951f158d795d97b56bab8b7eee82f86880fd2562fcb70c6b901362fb89cd38be9d060a5d1d0c852 +EBUILD createrepo-0.10.3.ebuild 1322 SHA256 bcaa11b95bbb78509d96a9ed4af30e8711709b6e1e966914fec89dc8cd86d2f8 SHA512 836f466dc049fa7caa87b5410abfa392fe6ec29f08f324718a58a2ae625ae4e1a6067f4d3126a9182917ed4ce312e1fcd11c6fb1cd1f402a7b1d003e9ac23810 WHIRLPOOL b6b9a5520cb67578123f8b268b270cdb81f3d46c6ce25dec0ffeadeadfd3c1f4cff9dcbc08e5bcc9ad244ebaabb31f79da0855263ccdb492e91d1b3d35c2a848 +MISC ChangeLog 1897 SHA256 21e911b04bf97e9b8511ffb54e2b0c6a57ff54526e6a0ed45c31a245cc1f3ce0 SHA512 16020f29a836fd254bb8576e78142d983af08627573885e3fe52ec47b233c6675ec1329ba348d9b587a282c3e269b98d91f297eb11be3e9e3a7ef4b8e2e7dc2c WHIRLPOOL 2a6e837ceffbf06c164b916182c6475c968c354800abb9446ac3bc476c883110ba9d99af4c65daa6dfd731475915c908e001c39e007ab83e7dd0325c282f040d MISC metadata.xml 227 SHA256 f3415c35ff8975db103e7b19bec4c319c5bec846936083a825175a96fd960975 SHA512 46b97c48fb7662893eea7b71e26c852e3f11c6d0db3f0d61be349fd1fa7160edae0b33b1c847dfbdff66a5d6d1224a68a2f61f161b707e0f3ec2f3ca85668a45 WHIRLPOOL 8b30fa164b7e5f48524271987600b6f8ba91ef5ab305256213df44eb12f878956e95219d1936753ebd3225317b6d297dfb7b2a9c21ae7ccf7bba41139bcf0dc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUm1ocXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlI0QAKTqnp3/wjHZowYOBXOzvzQI -G7jjI63Qkk/LCJraXWgYLXzmwTuW/okXez/BGZR829EnlAV1g8fxPS80/FVfiYfo -ft0EOYCvnNXkn8rNAUOcPL6e8Jzkvalj3MXVmRKl5/UeaA2Qd4lxCz5+MYhvzrRe -4yMfdZTAHG5eLw77Rdo4eUFvtWHmCd3fjbN4fkYmwLVhNwugFPO4Ul63hajlM2HU -lPApY6NIvKQioL7BujN6neYSLGwY5vNGboQllw6YfPzCxg+R3g4SIRp+cjez1oVE -gJfKWaz7Ad/hlcF/3quDhVkVVXYKIVTD3HICthUX148HjUvRzM3zmVDFd5Wy+1/K -x6g7oF6wVaBKtyt45H/IhdJ8xldkXjzGWF6nKu+TaiA7YAwHux+EggMZLSXKIgo6 -vfDCP+N0y7l2OOSW9vjjG1bp1GzdDoEnz6CLeOXHVtZy7SDUp3zSa0Wi/s91CTJo -MUbTH3yCnXoaIJOqE+uDCmHLWXaWdB9NZartJ+D8WlZSxQ/ejrsVA4TQ1ip6XnnD -GVe3YG7Pu7OEW4CvrWIoTMj1pRMUkVtHniUSzQlC23ioKmeYUCNeQ2nhbGEHUmRu -VFs2ekBKVIL9Q6t5PeOliSXkhK2nUrLTFh6+dSnjmSlHx6JnBRtmkUcJiLfmIJ1A -dIp7sKl/vx4YfIyV8Lrp -=F9Jc +iF4EAREIAAYFAlSb7xkACgkQXYk9GL8g3FEWNgD/Wf/LwS7jI0EYME+qyPorqlTg +u/Q6Ja3hq0+iAnJ82pABAJpz4OjYLdUOgEMK6YQrSFlfvBtFLVLbtj2T7styPraP +=TIsa -----END PGP SIGNATURE----- diff --git a/app-arch/createrepo/createrepo-0.9.9-r1.ebuild b/app-arch/createrepo/createrepo-0.10.3.ebuild similarity index 71% rename from app-arch/createrepo/createrepo-0.9.9-r1.ebuild rename to app-arch/createrepo/createrepo-0.10.3.ebuild index 06cc917eb5cd..5c62c13689e0 100644 --- a/app-arch/createrepo/createrepo-0.9.9-r1.ebuild +++ b/app-arch/createrepo/createrepo-0.10.3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.9.9-r1.ebuild,v 1.1 2014/12/25 00:28:11 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.10.3.ebuild,v 1.1 2014/12/25 11:03:49 alonbl Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='xml' -inherit python-single-r1 eutils +inherit python-single-r1 bash-completion-r1 DESCRIPTION="Creates a common rpm-metadata repository" HOMEPAGE="http://createrepo.baseurl.org/" @@ -30,17 +30,23 @@ DEPEND="${PYTHON_DEPS}" REQUIRED_USE=${PYTHON_REQUIRED_USE} -src_prepare() { - epatch "${WORKDIR}/${PN}-0.9.9-head.patch" - epatch "${FILESDIR}/${PN}-0.9.9-ten-changelog-limit.patch" - - sed -i -e '/^sysconfdir/s:=.*/:=/:' Makefile || die +pkg_setup() { + python-single-r1_pkg_setup + python_export PYTHON_SITEDIR } -src_compile() { :; } +src_compile() { + : +} src_install() { - emake install DESTDIR="${D}" + emake install \ + DESTDIR="${ED}" \ + PYTHON=true \ + compdir="$(get_bashcompdir)" \ + PKGDIR="${PYTHON_SITEDIR}/${PN}" dodoc ChangeLog README python_fix_shebang "${ED}" + python_optimize + python_optimize "${ED}/usr/share/createrepo" } diff --git a/app-arch/createrepo/createrepo-0.9.9.ebuild b/app-arch/createrepo/createrepo-0.9.9.ebuild deleted file mode 100644 index 0cfd7e9dcbc0..000000000000 --- a/app-arch/createrepo/createrepo-0.9.9.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.9.9.ebuild,v 1.1 2012/05/15 08:55:21 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2:2.7" -PYTHON_USE_WITH="xml" - -inherit python eutils - -DESCRIPTION="Creates a common metadata repository" -HOMEPAGE="http://createrepo.baseurl.org/" -SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz - http://dev.gentoo.org/~pacho/maintainer-needed/${PN}-0.9.9-head.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-python/urlgrabber-2.9.0 - >=app-arch/rpm-4.1.1[python] - dev-libs/libxml2[python] - >=app-arch/deltarpm-3.6_pre20110223[python] - dev-python/pyliblzma - >=sys-apps/yum-3.4.3" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch "${WORKDIR}/${PN}-0.9.9-head.patch" - epatch "${FILESDIR}/${PN}-0.9.9-ten-changelog-limit.patch" - - sed -i -e '/^sysconfdir/s:=.*/:=/:' Makefile || die -} - -src_compile() { :; } - -src_install() { - emake install DESTDIR="${D}" - dodoc ChangeLog README - python_convert_shebangs -r 2 "${ED}" -} diff --git a/app-arch/createrepo/files/createrepo-0.9.9-ten-changelog-limit.patch b/app-arch/createrepo/files/createrepo-0.9.9-ten-changelog-limit.patch deleted file mode 100644 index 07b61067462e..000000000000 --- a/app-arch/createrepo/files/createrepo-0.9.9-ten-changelog-limit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- createrepo/__init__.py~ 2011-01-26 12:14:30.000000000 -0500 -+++ createrepo/__init__.py 2011-01-26 12:34:17.291441719 -0500 -@@ -96,7 +96,7 @@ - self.mdtimestamp = 0 - self.directory = None - self.directories = [] -- self.changelog_limit = None # needs to be an int or None -+ self.changelog_limit = 10 # needs to be an int or None - self.unique_md_filenames = True - self.additional_metadata = {} # dict of 'type':'filename' - self.revision = str(int(time.time()))