Version bump, fix bug#533482, bug#533484, cleanup

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

4 files changed, 23 insertions, 67 deletions

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 <alonbl@gentoo.org> +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/createrepo-0.9.9-r1.ebuild b/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()))