[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/
commit: c1f8dc153734630fe6c70319ea046460f28a008b
Author: Marty E. Plummer startmail com>
AuthorDate: Sun Apr 8 14:03:20 2018 +
Commit: David Seifert gentoo org>
CommitDate: Fri Apr 20 20:36:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f8dc15
app-text/bibus: fdo-mime->xdg-utils
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7871
app-text/bibus/bibus-1.5.2-r3.ebuild | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild
b/app-text/bibus/bibus-1.5.2-r3.ebuild
index b00c1bb6559..f046112d4e0 100644
--- a/app-text/bibus/bibus-1.5.2-r3.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
-inherit fdo-mime python-r1 versionator
+inherit python-r1 versionator xdg-utils
DESCRIPTION="Bibliographic and reference management software, integrates with
LO and MS Word"
HOMEPAGE="http://bibus-biblio.sourceforge.net/;
@@ -76,11 +76,11 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/
commit: 988a76235dc5895d061e2dcdb808e777b8a9f691
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Nov 2 11:31:51 2017 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Thu Nov 2 11:31:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988a7623
app-text/bibus: remove old
Acked-by: David Seifert gentoo.org>
Package-Manager: Portage-2.3.8, Repoman-2.3.2
app-text/bibus/bibus-1.5.2-r2.ebuild | 86
1 file changed, 86 deletions(-)
diff --git a/app-text/bibus/bibus-1.5.2-r2.ebuild
b/app-text/bibus/bibus-1.5.2-r2.ebuild
deleted file mode 100644
index fa34f6e11d9..000
--- a/app-text/bibus/bibus-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils fdo-mime multilib python-r1 versionator
-
-DESCRIPTION="Bibliographic and reference management software, integrates with
LO and MS Word"
-HOMEPAGE="http://bibus-biblio.sourceforge.net/;
-SRC_URI="
- mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
- https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
- "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mysql"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# 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.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="
- ${PYTHON_DEPS}
- app-office/libreoffice
- dev-python/wxpython:2.8[${PYTHON_USEDEP}]
- dev-db/sqliteodbc
- dev-db/unixODBC
- mysql? (
- dev-python/mysql-python[${PYTHON_USEDEP}]
- dev-db/myodbc
- )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
- OFFICESUITE="/usr/$(get_libdir)/openoffice"
- else
- OFFICESUITE="/usr/$(get_libdir)/libreoffice"
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-install.patch \
- "${FILESDIR}"/${P}-bibus.cfg.patch \
- "${WORKDIR}"/${P}-lo-4.patch
-}
-
-src_compile() { :; }
-
-src_install() {
- einfo "Installing for ${OFFICESUITE}"
- installation() {
- emake \
- DESTDIR="${D}" \
- prefix="${EPREFIX}/usr" \
- oopath="${OFFICESUITE}/program" \
- ooure="${OFFICESUITE}/ure-link/lib" \
- oobasis="${OFFICESUITE}/program" \
- sysconfdir="${EPREFIX}/etc" \
- pythondir="$(python_get_sitedir)" \
- python=${PYTHON} \
- install install-doc-en
- }
- python_foreach_impl installation
- python_foreach_impl python_optimize
-
- python_foreach_impl python_newscript bibusStart.py ${PN}
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/
commit: 85805a41266535cde996cdb296dbdc872b628672
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Oct 23 17:44:03 2017 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Oct 23 17:45:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85805a41
app-text/bibus: amd64/x86 stable, bug #625198
Package-Manager: Portage-2.3.11, Repoman-2.3.3
app-text/bibus/bibus-1.5.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild
b/app-text/bibus/bibus-1.5.2-r3.ebuild
index 712ed76b631..b00c1bb6559 100644
--- a/app-text/bibus/bibus-1.5.2-r3.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="mysql"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/, app-text/bibus/files/
commit: cacaab1e23f5bfd4b429298564074828c614cb0d
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Jun 5 10:13:50 2017 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Jun 5 10:21:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cacaab1e
app-text/bibus: Use wxpython-3.0 with Debian patch (#601094)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-text/bibus/bibus-1.5.2-r3.ebuild| 86 +++
app-text/bibus/files/bibus-1.5.2-wx30.patch | 158
2 files changed, 244 insertions(+)
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild
b/app-text/bibus/bibus-1.5.2-r3.ebuild
new file mode 100644
index 000..712ed76b631
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit fdo-mime python-r1 versionator
+
+DESCRIPTION="Bibliographic and reference management software, integrates with
LO and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/;
+SRC_URI="
+ mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
+ https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
+ "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="mysql"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# 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.
+# Cannot depend on virtual/ooo
+# bibus fails to start with app-office/openoffice-bin (bug #288232).
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-office/libreoffice
+ dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ dev-db/sqliteodbc
+ dev-db/unixODBC
+ mysql? (
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-db/myodbc
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-install.patch
+ "${FILESDIR}"/${P}-bibus.cfg.patch
+ "${WORKDIR}"/${P}-lo-4.patch
+ "${FILESDIR}"/${P}-wx30.patch
+)
+
+pkg_setup() {
+ if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
+ OFFICESUITE="/usr/$(get_libdir)/openoffice"
+ else
+ OFFICESUITE="/usr/$(get_libdir)/libreoffice"
+ fi
+}
+
+src_compile() { :; }
+
+src_install() {
+ einfo "Installing for ${OFFICESUITE}"
+ installation() {
+ emake \
+ DESTDIR="${D}" \
+ prefix="${EPREFIX}/usr" \
+ oopath="${OFFICESUITE}/program" \
+ ooure="${OFFICESUITE}/ure-link/lib" \
+ oobasis="${OFFICESUITE}/program" \
+ sysconfdir="${EPREFIX}/etc" \
+ pythondir="$(python_get_sitedir)" \
+ python=${PYTHON} \
+ install install-doc-en
+ }
+ python_foreach_impl installation
+ python_foreach_impl python_optimize
+
+ python_foreach_impl python_newscript bibusStart.py ${PN}
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
diff --git a/app-text/bibus/files/bibus-1.5.2-wx30.patch
b/app-text/bibus/files/bibus-1.5.2-wx30.patch
new file mode 100644
index 000..b5348674181
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.2-wx30.patch
@@ -0,0 +1,158 @@
+Author: Jan Beyer
+Copyright: Copyright 2014 Jan Beyer
+License: The same as the Bibus packaging.
+Description: Patch to migrate bibus from wxpython2.8 to wxpython 3.0
+ Thanks to Olly Betts for the script that did the main work:
+ http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git
+
+--- a/ShortcutEd.py
b/ShortcutEd.py
+@@ -27,7 +27,7 @@
+ self.category = category# edited category
+ self.short = short # current shortcuts list
+ # begin wxGlade: Capture.__init__
+- kwds["style"] =
wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
++ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
+ wx.Dialog.__init__(self, *args, **kwds)
+ self.label_1 = wx.StaticText(self, -1, _("Capture from field"))
+ self.choice_field = wx.Choice(self, -1, choices=[])
+@@ -110,7 +110,7 @@
+ self.parentshort = short# we keep a copy for updating
it latter
+ self.db = db# connection to the
database
+ # begin wxGlade: ShortcutEd.__init__
+- kwds["style"] =
wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
++ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
+
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/
commit: 5251b882ff8f813e5516288d5602f76c4c21e146
Author: Harri Nieminen gmail com>
AuthorDate: Sat Feb 18 07:00:46 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 18 09:52:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5251b882
app-text/bibus: Fix toolong.DESCRIPTION
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4003
app-text/bibus/bibus-1.5.2-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/bibus/bibus-1.5.2-r2.ebuild
b/app-text/bibus/bibus-1.5.2-r2.ebuild
index 39df9886cf..505539ad45 100644
--- a/app-text/bibus/bibus-1.5.2-r2.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite"
inherit eutils fdo-mime multilib python-r1 versionator
-DESCRIPTION="Bibliographic and reference management software, integrates with
L/OO.o and MS Word"
+DESCRIPTION="Bibliographic and reference management software, integrates with
LO and MS Word"
HOMEPAGE="http://bibus-biblio.sourceforge.net/;
SRC_URI="
mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/, sci-chemistry/pymol-plugins-dssp/, dev-python/pygtkglext/, ...
commit: e6baf15ca118e171c7d63041fb0a38625286a76b
Author: Justin Lecher gentoo org>
AuthorDate: Thu Oct 22 10:26:44 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Oct 22 10:26:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6baf15c
Drop deprecated usage of parallel python eclass functions
Python eclasses dropped parallel execution support some while ago.
python_parallel_foreach_impl was an alias for python_foreach_impl for some
time already.
Signed-off-by: Justin Lecher gentoo.org>
app-text/bibus/bibus-1.5.2-r2.ebuild | 4 ++--
dev-libs/libgamin/libgamin-0.1.10-r5.ebuild | 2 +-
dev-python/PyQt4/PyQt4-4.11.1.ebuild | 2 +-
dev-python/cgkit/cgkit-2.0.0.ebuild | 2 +-
dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild| 2 +-
dev-python/pSQL/pSQL-1.2.0.ebuild | 2 +-
dev-python/pSQL/pSQL-1.2.1.ebuild | 2 +-
dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild | 2 +-
dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild | 2 +-
dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild | 2 +-
dev-python/pythonmagick/pythonmagick-0.9.11.ebuild| 2 +-
dev-python/pythonmagick/pythonmagick-0.9.12.ebuild| 2 +-
dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild| 2 +-
dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild | 2 +-
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 2 +-
net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild | 2 +-
net-libs/gupnp/gupnp-0.20.13.ebuild | 2 +-
net-libs/gupnp/gupnp-0.20.14.ebuild | 2 +-
sci-biology/last/last-299.ebuild | 2 +-
sci-chemistry/acpype/acpype-389.ebuild| 4 ++--
sci-chemistry/parassign/parassign-20130522.ebuild | 2 +-
sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild | 2 +-
sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild | 2 +-
.../pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.ebuild | 4 ++--
sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild | 4 ++--
.../pymol-plugins-dynamics/pymol-plugins-dynamics-1.2.0.ebuild| 4 ++--
.../pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild| 2 +-
sci-chemistry/pymol-plugins-msms/pymol-plugins-msms-100415-r1.ebuild | 4 ++--
sys-apps/kmod/kmod-20.ebuild | 2 +-
sys-apps/kmod/kmod-21.ebuild | 2 +-
sys-apps/kmod/kmod-.ebuild| 2 +-
sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild | 2 +-
sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild | 2 +-
sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild | 2 +-
x11-proto/xcb-proto/xcb-proto-1.10.ebuild | 2 +-
x11-proto/xcb-proto/xcb-proto-1.11.ebuild | 2 +-
x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild | 2 +-
x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild | 2 +-
38 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/app-text/bibus/bibus-1.5.2-r2.ebuild
b/app-text/bibus/bibus-1.5.2-r2.ebuild
index f4de2be..39df988 100644
--- a/app-text/bibus/bibus-1.5.2-r2.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r2.ebuild
@@ -71,9 +71,9 @@ src_install() {
install install-doc-en
}
python_foreach_impl installation
- python_parallel_foreach_impl python_optimize
+ python_foreach_impl python_optimize
- python_parallel_foreach_impl python_newscript bibusStart.py ${PN}
+ python_foreach_impl python_newscript bibusStart.py ${PN}
}
pkg_postinst() {
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index f7f5a6b..0550f72 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
@@ -95,7 +95,7 @@ multilib_src_configure() {
econf "${myconf[@]}" --with-python
}
- python_parallel_foreach_impl python_configure
+ python_foreach_impl python_configure
fi
}
diff --git a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
index 30528c8..5fa3be8 100644
--- a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
@@ -176,7 +176,7 @@ src_configure() {
popd > /dev/null || return
fi
}
-
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/files/, app-text/bibus/
commit: 62be35a4de3c29c29f82df4662a123f31e457ab0
Author: Justin Lecher gentoo org>
AuthorDate: Thu Oct 22 09:06:58 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Oct 22 10:13:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62be35a4
app-text/bibus: Drop old
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher gentoo.org>
app-text/bibus/Manifest| 1 -
app-text/bibus/bibus-1.5.1.ebuild | 73 ---
app-text/bibus/bibus-1.5.2.ebuild | 80
app-text/bibus/files/bibus-1.5.0-install.patch | 262 -
4 files changed, 416 deletions(-)
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
index ad03eda..04ed182 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -1,2 +1 @@
-DIST bibus-1.5.1.tar.gz 4989431 SHA256
1e6e6895124d2ab4147be83f2f87d0b1e78b2786f27345b3d1a3976d13d4c70d SHA512
9181dcc332ea139f31c44c10d084581c2d12ce2333c263eede30f2800e155cdaf0d649a6747cf30d7a259ef172d5370a351c5d747200ae7e5dfe88606f95089c
WHIRLPOOL
65d9448b6d3e0ec38932b76d3e7c73ef696b9e00733b65810a1d8f789878e4c0a06378dc00b8e1c881c71c64270b44d50b97370129745dcfcf45a1bdc5b1e175
DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256
c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512
33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4
WHIRLPOOL
964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
diff --git a/app-text/bibus/bibus-1.5.1.ebuild
b/app-text/bibus/bibus-1.5.1.ebuild
deleted file mode 100644
index 35f0fd4..000
--- a/app-text/bibus/bibus-1.5.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH=sqlite
-
-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 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.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="
- app-office/libreoffice
- =dev-python/wxpython-2.8*
- dev-db/sqliteodbc
- dev-db/unixODBC
- mysql? (
- dev-python/mysql-python
- dev-db/myodbc
- )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.5.0-install.patch
-
- sed \
- -e "s:gentoo-python:python$(python_get_version):g" \
- -i Makefile Setup/Makefile Setup/bibus.cfg Setup/bibus.sh \
- || die "Failed to adjust python paths"
-
- # Disable byte-compilation of Python modules.
- sed -e '/\$(compile)/d' -i Makefile || die "sed failed"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- oopath="/usr/$(get_libdir)/openoffice/program" \
- prefix='$(DESTDIR)/usr' \
- sysconfdir='$(DESTDIR)/etc' \
- install || die "emake install failed"
- emake \
- DESTDIR="${D}" \
- oopath="/usr/$(get_libdir)/openoffice/program" \
- prefix='$(DESTDIR)/usr' \
- sysconfdir='$(DESTDIR)/etc' \
- install-doc-en || die "emake install failed"
-}
-
-pkg_postinst() {
- python_mod_optimize bibus
-}
-
-pkg_postrm() {
- python_mod_cleanup bibus
-}
diff --git a/app-text/bibus/bibus-1.5.2.ebuild
b/app-text/bibus/bibus-1.5.2.ebuild
deleted file mode 100644
index 3c39822..000
--- a/app-text/bibus/bibus-1.5.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
-PYTHON_USE_WITH=sqlite
-
-inherit eutils fdo-mime multilib python versionator
-
-DESCRIPTION="Bibliographic and reference management software, integrates with
L/OO.o and MS Word"
-HOMEPAGE="http://bibus-biblio.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/, app-text/bibus/files/
commit: e10be8fca2dbab93315cd90eb28245194ebf7c44
Author: Justin Lecher gentoo org>
AuthorDate: Thu Oct 22 10:08:49 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Oct 22 10:13:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10be8fc
app-text/bibus: Fix for gentoo specific paths and fix for lo-4
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=485396
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=562214
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher gentoo.org>
app-text/bibus/Manifest| 1 +
...bibus-1.5.2-r1.ebuild => bibus-1.5.2-r2.ebuild} | 10 +--
app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch | 31 ++
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
index 04ed182..ad942e9 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -1 +1,2 @@
+DIST bibus-1.5.2-lo-4.patch.xz 13196 SHA256
b7147230929c304ab357c6a725c5cabbd577607e6200df968cdf2c057603c8a1 SHA512
68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1
WHIRLPOOL
d807d81277fac722c50d98575939142a6f1f5a1e9eb88dec0acf0053349f54ecce7d7dcf070742b143bbf166704994b401eeb1e1ecd3e32c351d9bc41c09d1d8
DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256
c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512
33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4
WHIRLPOOL
964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
diff --git a/app-text/bibus/bibus-1.5.2-r1.ebuild
b/app-text/bibus/bibus-1.5.2-r2.ebuild
similarity index 88%
rename from app-text/bibus/bibus-1.5.2-r1.ebuild
rename to app-text/bibus/bibus-1.5.2-r2.ebuild
index 17f6d3b..f4de2be 100644
--- a/app-text/bibus/bibus-1.5.2-r1.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r2.ebuild
@@ -11,7 +11,10 @@ inherit eutils fdo-mime multilib python-r1 versionator
DESCRIPTION="Bibliographic and reference management software, integrates with
L/OO.o and MS Word"
HOMEPAGE="http://bibus-biblio.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz"
+SRC_URI="
+ mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
+ https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
+ "
LICENSE="GPL-2"
SLOT="0"
@@ -45,7 +48,10 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-install.patch
+ epatch \
+ "${FILESDIR}"/${P}-install.patch \
+ "${FILESDIR}"/${P}-bibus.cfg.patch \
+ "${WORKDIR}"/${P}-lo-4.patch
}
src_compile() { :; }
diff --git a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
new file mode 100644
index 000..bfba0c0
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
@@ -0,0 +1,31 @@
+ bibusStart.py | 8 +---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/bibusStart.py b/bibusStart.py
+index edfc19f..99c5381 100644
+--- a/bibusStart.py
b/bibusStart.py
+@@ -17,12 +17,14 @@
+ # along with Bibus; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+-import ConfigParser,os,sys,urllib,urlparse
++import ConfigParser,os,sys,urllib,urlparse,site
+ cp=ConfigParser.ConfigParser()
+ fileName = sys.argv[0]
+ while os.path.islink(fileName): fileName = os.readlink(fileName)
+ sourcedir = os.path.abspath( os.path.dirname(fileName) )
+-cp.read( os.path.join(sourcedir,'bibus.cfg') )
++bibus_sitedir = os.path.join(site.getsitepackages()[0], 'bibus')
++bibus_cfg = os.path.join(bibus_sitedir, 'bibus.cfg')
++cp.read(bibus_cfg)
+ # We read first, then if it is not null we convert to absolute path
+ # otherwise, empty path will be converted to the current directory path
+ python = cp.get('PATH','python')
+@@ -69,5 +71,5 @@ else:
+ except KeyError:
+ os.environ[LIBPATH] = oopath
+ # starting Bibus
+-os.execl( python , os.path.basename(python) , QUOTE+
os.path.join(sourcedir,'bibus.py') +QUOTE )
++os.execl( python , os.path.basename(python) , QUOTE+
os.path.join(bibus_sitedir,'bibus.py') +QUOTE )
+
[gentoo-commits] repo/gentoo:master commit in: app-text/bibus/
commit: 4ef73396be71eb1bd327e2a7dc53982ce9ef694f
Author: Agostino Sarubbo ago AT gentoo DOT org
AuthorDate: Wed Aug 12 19:04:03 2015 +
Commit: Agostino Sarubbo ago AT gentoo DOT org
CommitDate: Wed Aug 12 19:04:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef73396
app-text/bibus-1.5.2-r1: x86 stable wrt bug #529412
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches=x86
app-text/bibus/bibus-1.5.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/bibus/bibus-1.5.2-r1.ebuild
b/app-text/bibus/bibus-1.5.2-r1.ebuild
index 1cc6cc2..17f6d3b 100644
--- a/app-text/bibus/bibus-1.5.2-r1.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI=mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
LICENSE=GPL-2
SLOT=0
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
IUSE=mysql
REQUIRED_USE=${PYTHON_REQUIRED_USE}
