From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Feb 2019 15:11:50 +0000 Subject: gentoo resync : 20.02.2019 --- dev-libs/gom/Manifest | 3 +- dev-libs/gom/files/0.3.2-fix-pkgconfig.patch | 34 ++++++++++++ dev-libs/gom/gom-0.3.2-r1.ebuild | 77 ++++++++++++++++++++++++++++ dev-libs/gom/gom-0.3.2.ebuild | 76 --------------------------- 4 files changed, 113 insertions(+), 77 deletions(-) create mode 100644 dev-libs/gom/files/0.3.2-fix-pkgconfig.patch create mode 100644 dev-libs/gom/gom-0.3.2-r1.ebuild delete mode 100644 dev-libs/gom/gom-0.3.2.ebuild (limited to 'dev-libs/gom') diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest index 9825434bdbac..33fbffbf7d79 100644 --- a/dev-libs/gom/Manifest +++ b/dev-libs/gom/Manifest @@ -1,3 +1,4 @@ +AUX 0.3.2-fix-pkgconfig.patch 935 BLAKE2B cc769ecd649c5ee39a5f934268cd55b031bc64512f0abce40e440e9a7fed30b497e1d8d14e267647a0022736befa1880b56b8e1c37a879892bd47381eb9e312f SHA512 5a98cffcff486f485ce9b73ddcee65566689d45df18f86a0a5697df1b2fb4ed3fa1bfe9a915bb8f22c2f3afc4f24da97b739bc1a61310b34fded75bd7a415eb8 DIST gom-0.3.2.tar.xz 410300 BLAKE2B c0c79c1c3f8a28a0ee992fa4c316538eb87ec26c77def353e8b2038e32f30f9daed433c6d6f6c81069e05e46a980f7d944c955182d973d42f3bd84a341c5a34d SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675 -EBUILD gom-0.3.2.ebuild 1549 BLAKE2B 51c0dd92ab9fc1da878880258fa1f9bf5195d610c493bf65e55e2a600afcd4bc64b4850594d85c8faf7a82e84caf2cd4761a3b58ec7c37af7c923682d8576a0c SHA512 697886b671e63d10bc03ee4d7c91a73eb3ad27985d418643212b8367d77821a7609fa19c4ea0e267e8f8fe2ee6eb9dbb8a1fa1c5d362f977d2c0e931b3250dca +EBUILD gom-0.3.2-r1.ebuild 1601 BLAKE2B ed50116977a9a8fc9d9702988e13bc04e5e7016881aec917c23aaf094eeea605cfe3f4dcce007e5e868b9f3fe1705ba1526afa80169eca70fa2aa36ed0221bfb SHA512 59096c64c0aaa2989862a76ec87ae303d353aaa84047ff94e6ef61e6e013f0ca2967ad90cc43abc7d62058f8715247861c00536d2d277362ade78df25366632d MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/gom/files/0.3.2-fix-pkgconfig.patch b/dev-libs/gom/files/0.3.2-fix-pkgconfig.patch new file mode 100644 index 000000000000..447c91421cc9 --- /dev/null +++ b/dev-libs/gom/files/0.3.2-fix-pkgconfig.patch @@ -0,0 +1,34 @@ +From 07c35149964c7258e52effa374d877a8f2f102e8 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Fri, 29 Jul 2016 03:18:03 +0300 +Subject: [PATCH] build: Replace hardcoded values in pkg-config file + +https://bugzilla.gnome.org/show_bug.cgi?id=769291 +--- + data/gom-1.0.pc.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/gom-1.0.pc.in b/data/gom-1.0.pc.in +index ce19de6..6edc841 100644 +--- a/data/gom-1.0.pc.in ++++ b/data/gom-1.0.pc.in +@@ -1,11 +1,11 @@ + prefix=@prefix@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/lib +-includedir=${exec_prefix}/include ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: Gom + Description: GObject Data Mapper + Version: @VERSION@ +-Libs: -L${libdir} -lgom-1.0 +-Cflags: -I${includedir}/gom-1.0 ++Libs: -L${libdir} -lgom-@GOM_API_VERSION@ ++Cflags: -I${includedir}/gom-@GOM_API_VERSION@ + Requires: gobject-2.0 +-- +2.17.0 + diff --git a/dev-libs/gom/gom-0.3.2-r1.ebuild b/dev-libs/gom/gom-0.3.2-r1.ebuild new file mode 100644 index 000000000000..384abeb6ccdc --- /dev/null +++ b/dev-libs/gom/gom-0.3.2-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +PYTHON_COMPAT=( python{3_4,3_5,3_6} ) + +inherit epatch gnome2 python-r1 + +DESCRIPTION="GObject to SQLite object mapper library" +HOMEPAGE="https://wiki.gnome.org/Projects/Gom" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="+introspection python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )" + +RDEPEND=" + >=dev-db/sqlite-3.7:3 + >=dev-libs/glib-2.36:2 + introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) + python? ( + ${PYTHON_DEPS} + >=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.14 + >=dev-util/intltool-0.40.0 + sys-devel/gettext + virtual/pkgconfig + x11-libs/gdk-pixbuf:2 +" +# TODO: make gdk-pixbuf properly optional with USE=test + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-fix-pkgconfig.patch + gnome2_src_prepare + + use python && python_copy_sources +} + +src_configure() { + # glibtest is a relic from AM_PATH_GLIB macro + local myconf=( + --disable-static + --disable-glibtest + ) + + gnome2_src_configure \ + ${myconf[@]} \ + --disable-python \ + $(use_enable introspection) + + if use python ; then + python_foreach_impl run_in_build_dir \ + gnome2_src_configure \ + ${myconf[@]} \ + --enable-python + fi +} + +src_install() { + gnome2_src_install + + if use python ; then + docinto examples + dodoc examples/*.py + + python_foreach_impl run_in_build_dir \ + emake DESTDIR="${D}" install-overridesPYTHON + fi +} diff --git a/dev-libs/gom/gom-0.3.2.ebuild b/dev-libs/gom/gom-0.3.2.ebuild deleted file mode 100644 index c69949bbf5ec..000000000000 --- a/dev-libs/gom/gom-0.3.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -inherit gnome2 python-r1 - -DESCRIPTION="GObject to SQLite object mapper library" -HOMEPAGE="https://wiki.gnome.org/Projects/Gom" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+introspection python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )" - -RDEPEND=" - >=dev-db/sqlite-3.7:3 - >=dev-libs/glib-2.36:2 - introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - sys-devel/gettext - virtual/pkgconfig - x11-libs/gdk-pixbuf:2 -" -# TODO: make gdk-pixbuf properly optional with USE=test - -pkg_setup() { - use python && python_setup -} - -src_prepare() { - gnome2_src_prepare - - use python && python_copy_sources -} - -src_configure() { - # glibtest is a relic from AM_PATH_GLIB macro - local myconf=( - --disable-static - --disable-glibtest - ) - - gnome2_src_configure \ - ${myconf[@]} \ - --disable-python \ - $(use_enable introspection) - - if use python ; then - python_foreach_impl run_in_build_dir \ - gnome2_src_configure \ - ${myconf[@]} \ - --enable-python - fi -} - -src_install() { - gnome2_src_install - - if use python ; then - docinto examples - dodoc examples/*.py - - python_foreach_impl run_in_build_dir \ - emake DESTDIR="${D}" install-overridesPYTHON - fi -} -- cgit v1.2.3