diff options
author | Alastair Tse <liquidx@gentoo.org> | 2004-01-25 12:38:02 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2004-01-25 12:38:02 +0000 |
commit | 3ff05bacc6054f44bbc6e3bf2ebc75b079a7aac2 (patch) | |
tree | bd1669026fa74b63d034d10c7411eea30ff9afff /app-arch/rpm | |
parent | New version (diff) | |
download | historical-3ff05bacc6054f44bbc6e3bf2ebc75b079a7aac2.tar.gz historical-3ff05bacc6054f44bbc6e3bf2ebc75b079a7aac2.tar.bz2 historical-3ff05bacc6054f44bbc6e3bf2ebc75b079a7aac2.zip |
Using python eclass to choose python version, optimize/remove pyc/pyo, added py2.3 patch thanks to Vaclav Slavik <vaclav.slavik@matfyz.cz> (#39282)
Diffstat (limited to 'app-arch/rpm')
-rw-r--r-- | app-arch/rpm/ChangeLog | 7 | ||||
-rw-r--r-- | app-arch/rpm/Manifest | 7 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.2-python2.3.diff | 44 | ||||
-rw-r--r-- | app-arch/rpm/rpm-4.2.1.ebuild | 22 | ||||
-rw-r--r-- | app-arch/rpm/rpm-4.2_pre069.ebuild | 4 |
5 files changed, 72 insertions, 12 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index f1a60fe3c610..b9f2d507814c 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/rpm # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.32 2004/01/15 19:59:54 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.33 2004/01/25 12:38:02 liquidx Exp $ + + 25 Jan 2004; Alastair Tse <liquidx@gentoo.org> rpm-4.2.1.ebuild, + files/rpm-4.2-python2.3.diff: + Using python eclass to choose python version, optimize/remove pyc/pyo, added + py2.3 patch thanks to Vaclav Slavik <vaclav.slavik@matfyz.cz> (#39282) 15 Jan 2004; <agriffis@gentoo.org> rpm-4.2.1.ebuild: stable on alpha and ia64 diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 8a09d43cff46..9a24f2bb2398 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,7 +1,7 @@ -MD5 95be8f7c7820df8881e4e5ae4703bcd3 ChangeLog 4856 +MD5 01781fd8b1c1121208945a953b889849 ChangeLog 5107 MD5 422a319476b2e8f7610677aef2e5377a rpm-4.0.4-r5.ebuild 1603 -MD5 5272269376e8dfcd4e4045b70cc657c9 rpm-4.2.1.ebuild 2306 -MD5 e244d95b6b885f82f182a98f4be640cf rpm-4.2_pre069.ebuild 2155 +MD5 e08b1cd046d642d69ffc1ea15c0afecd rpm-4.2.1.ebuild 2504 +MD5 11f939c12c6c307d880fa9277d914adf rpm-4.2_pre069.ebuild 2167 MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62 MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62 MD5 576f625499d593cd3424798fe480090e files/digest-rpm-4.2_pre069 65 @@ -10,4 +10,5 @@ MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495 MD5 90a229eb084e54a880c72d83dffa31cb files/rpm-4.0.4-popt-popt.c-gentoo.diff 206 MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639 MD5 fe39156514725cf08be38b39fe3f6f3c files/rpm-4.1-system-popt.diff 21458 +MD5 ec4886ca775cb1cb83aebcd42f20f59f files/rpm-4.2-python2.3.diff 1479 MD5 3d46eae2efd769e423b004de176d9812 files/rpm-4.2-system-popt.diff 14435 diff --git a/app-arch/rpm/files/rpm-4.2-python2.3.diff b/app-arch/rpm/files/rpm-4.2-python2.3.diff new file mode 100644 index 000000000000..6326c0d37832 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.2-python2.3.diff @@ -0,0 +1,44 @@ +diff -ru rpm-4.2.1/python/Makefile.in rpm-4.2.1.new/python/Makefile.in +--- rpm-4.2.1/python/Makefile.in 2003-07-16 19:05:47.000000000 +0200 ++++ rpm-4.2.1.new/python/Makefile.in 2004-01-24 21:38:59.000000000 +0100 +@@ -258,7 +258,8 @@ + + PYVER = @WITH_PYTHON_VERSION@ + +-pylibdir = $(shell python -c 'import sys; print sys.path[1]') ++ ++pythondir = $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0)') + pyincdir = $(prefix)/include/python${PYVER} + + SUBDIRS = rpmdb test +@@ -291,10 +292,9 @@ + + LDADD = + +-pythondir = $(pylibdir)/site-packages + python_PROGRAMS = rpmmodule.so + +-rpmdbdir = $(pylibdir)/site-packages/rpmdb ++rpmdbdir = $(pythondir)/rpmdb + rpmdb_PROGRAMS = _rpmdb.so + + noinst_PROGRAMS = poptmodule.so +diff -ru rpm-4.2.1/python/rpmdb/Makefile.in rpm-4.2.1.new/python/rpmdb/Makefile.in +--- rpm-4.2.1/python/rpmdb/Makefile.in 2003-07-16 19:05:47.000000000 +0200 ++++ rpm-4.2.1.new/python/rpmdb/Makefile.in 2004-01-24 22:06:07.000000000 +0100 +@@ -256,13 +256,13 @@ + + PYVER = @WITH_PYTHON_VERSION@ + +-pylibdir = $(shell python -c 'import sys; print sys.path[1]') ++pythondir = $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0)') + + EXTRA_DIST = \ + __init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py + + +-rpmdbdir = $(pylibdir)/site-packages/rpmdb ++rpmdbdir = $(pythondir)/rpmdb + rpmdb_SCRIPTS = \ + __init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py + diff --git a/app-arch/rpm/rpm-4.2.1.ebuild b/app-arch/rpm/rpm-4.2.1.ebuild index dd2ca6fc4d23..8f6fd058cc7d 100644 --- a/app-arch/rpm/rpm-4.2.1.ebuild +++ b/app-arch/rpm/rpm-4.2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.9 2004/01/15 19:59:54 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.10 2004/01/25 12:38:02 liquidx Exp $ -inherit flag-o-matic libtool eutils +inherit python flag-o-matic libtool eutils DESCRIPTION="Red Hat Package Management Utils" SRC_URI="mirror://gentoo/rpm-4.2.1.tar.gz" @@ -19,14 +19,14 @@ RDEPEND="=sys-libs/db-3.2* dev-libs/elfutils >=dev-libs/beecrypt-3.1.0-r1 nls? ( sys-devel/gettext ) - python? ( =dev-lang/python-2.2* ) - doc? ( app-doc/doxygen )" -S=${WORKDIR}/rpm-4.2.1 + python? ( >=dev-lang/python-2.2 ) + !ia64? ( doc? ( app-doc/doxygen ) )" strip-flags src_unpack() { unpack ${A} + epatch ${FILESDIR}/rpm-4.2-python2.3.diff } src_compile() { @@ -35,8 +35,10 @@ src_compile() { unset LD_ASSUME_KERNEL local myconf myconf="--enable-posixmutexes --without-javaglue" + + python_version use python \ - && myconf="${myconf} --with-python=2.2" \ + && myconf="${myconf} --with-python=${PYVER}" \ || myconf="${myconf} --without-python" econf ${myconf} `use_enable nls` || die @@ -81,4 +83,12 @@ pkg_postinst() { einfo "No RPM database found... Creating database..." ${ROOT}/usr/bin/rpm --initdb --root=${ROOT} fi + + python_version + python_mod_optimize /usr/lib/python${PYVER}/site-packages/rpmdb +} + +pkg_postrm() { + python_version + python_mod_cleanup } diff --git a/app-arch/rpm/rpm-4.2_pre069.ebuild b/app-arch/rpm/rpm-4.2_pre069.ebuild index bf9a5e6a5471..bcd4b3ef19a7 100644 --- a/app-arch/rpm/rpm-4.2_pre069.ebuild +++ b/app-arch/rpm/rpm-4.2_pre069.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2_pre069.ebuild,v 1.6 2003/11/14 20:00:38 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2_pre069.ebuild,v 1.7 2004/01/25 12:38:02 liquidx Exp $ inherit flag-o-matic libtool eutils @@ -21,7 +21,7 @@ RDEPEND="=sys-libs/db-3.2* dev-libs/elfutils nls? ( sys-devel/gettext ) python? ( =dev-lang/python-2.2* ) - doc? ( app-doc/doxygen )" + !sparc? ( doc? ( app-doc/doxygen ) )" S=${WORKDIR}/rpm-4.2 strip-flags |