From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 4 Jun 2010 21:12:12 +0000 (+0000) Subject: Use Python 2. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca6b05b615e7da047e52988a143663c27ccc9d43;p=gentoo.git Use Python 2. Package-Manager: portage-HEAD/cvs/Linux x86_64 --- diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog index eb61d3f1aa8e..90d0af10305f 100644 --- a/app-text/bibus/ChangeLog +++ b/app-text/bibus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/bibus # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.19 2010/06/04 20:56:53 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.20 2010/06/04 21:12:12 arfrever Exp $ + + 04 Jun 2010; Arfrever Frehtes Taifersar Arahesis + bibus-1.5.0.ebuild: + Use Python 2. 04 Jun 2010; Arfrever Frehtes Taifersar Arahesis bibus-1.4.3.2-r1.ebuild, bibus-1.5.0.ebuild: diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest index 0057234338a7..9b25a96aa6dd 100644 --- a/app-text/bibus/Manifest +++ b/app-text/bibus/Manifest @@ -8,6 +8,6 @@ DIST bibus-1.4.3.2.tar.gz 4800983 RMD160 3a228596f21fabd64a2d791614bb0136c8e28da DIST bibus-1.5.0.tar.gz 4991540 RMD160 4b1083920bf2a073b6eceac63ddd635bf23aec52 SHA1 e5263a06d1bcbf7be6c91e61862f672e6ad80059 SHA256 311d4c73ed0e234df6c05429eb1fa3f0cd3e67a961ac4f52a53f8c253569eafa EBUILD bibus-1.4.3.1.ebuild 1816 RMD160 276f5886edecea6ddbce084259f2d069e78b8e83 SHA1 90334a520ec61394a8258075bb094737db1e87b7 SHA256 62f377550be9e5294d0fd7e127551a961f22aa7ca158857e24ad0203203099e2 EBUILD bibus-1.4.3.2-r1.ebuild 1801 RMD160 daae66d9ceff0679b9888d1a58d55518bc3f6a5e SHA1 e7ad520060303b5da04a25d9f18d59b7e315be1e SHA256 5435e58c408cbb34567ef757766d9f073572de26ee83dc0eca7a5830283dbfc6 -EBUILD bibus-1.5.0.ebuild 1651 RMD160 d53195704306cf8253b726c3c83e3c9b43f2921b SHA1 8cbb12a6704730568006259326c37adbf8ed9a93 SHA256 dcdf5d323eaf4d2d9200910440b0da86c2b0ee9fcf1230f185fae05847845ba2 -MISC ChangeLog 3612 RMD160 3c755c06877ffb128ba7c874dc412ba871e3ee6d SHA1 9a478e946a55374d82659264d1c79c6d55d21591 SHA256 c40fba3c2cde3a97d9cc2bfde108e0ce358f4de857e0b3e310264f4982efcbbd +EBUILD bibus-1.5.0.ebuild 1691 RMD160 0c836ce2a412bb1c3aaca5bb2f9b078e7f3a6369 SHA1 60a295cccb86d80e79b5d1c6f769faabedf826d6 SHA256 12fa5dbab0b2f5cb163727e41269d0ed7c04d60a45fe38731906d8d5c768ca1c +MISC ChangeLog 3724 RMD160 d409d7b73aaad1b9a7a05ff18847f6a6033ef151 SHA1 6682dfa4c15e69140db56f00001800a1cc369782 SHA256 eec6a6aa662441496092f6aff646f9ef6f398fe010f1094458a31bcbd8b0b893 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/app-text/bibus/bibus-1.5.0.ebuild b/app-text/bibus/bibus-1.5.0.ebuild index 2c22eacd1474..df6bbfd1f853 100644 --- a/app-text/bibus/bibus-1.5.0.ebuild +++ b/app-text/bibus/bibus-1.5.0.ebuild @@ -1,18 +1,21 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.0.ebuild,v 1.3 2010/06/04 20:56:53 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.0.ebuild,v 1.4 2010/06/04 21:12:12 arfrever Exp $ -EAPI="2" +EAPI="3" +PYTHON_DEPEND="2" -inherit python multilib eutils versionator +inherit multilib eutils python versionator DESCRIPTION="Bibliographic and reference management software, integrates with OO.o and MS Word" HOMEPAGE="http://bibus-biblio.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}-biblio/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="mysql" + # Most of this mess is designed to give the choice of sqlite or mysql # but prefer sqlite. We also need to default to sqlite if neither is requested. RDEPEND="virtual/ooo @@ -26,6 +29,11 @@ RDEPEND="virtual/ooo dev-db/unixODBC" DEPEND="${RDEPEND}" +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_prepare() { epatch "${FILESDIR}"/${P}-install.patch epatch "${FILESDIR}"/${P}-pysqlite.patch @@ -50,9 +58,9 @@ src_install() { } pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/bibus + python_mod_optimize bibus } pkg_postrm() { - python_mod_cleanup $(python_get_sitedir)/bibus + python_mod_cleanup bibus }