public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/
@ 2013-07-10 16:02 Justin Lecher
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-07-10 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     46d59e4fbb34740a30b263e90e5d27ae01fd4eb9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 15:59:33 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 15:59:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=46d59e4f

sci-chemistry/gnome-chemistry-utils: Add live ebuild, fix extern C problems, #474498 and https://github.com/gentoo-science/sci/issues/84

Package-Manager: portage-2.2.0_alpha188

---
 sci-chemistry/gnome-chemistry-utils/ChangeLog      |  8 +++
 .../gnome-chemistry-utils-0.14.2-extern-c.patch    | 84 ++++++++++++++++++++++
 .../gnome-chemistry-utils-0.14.2.ebuild            | 12 +++-
 ....2.ebuild => gnome-chemistry-utils-9999.ebuild} | 19 +++--
 4 files changed, 116 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/gnome-chemistry-utils/ChangeLog b/sci-chemistry/gnome-chemistry-utils/ChangeLog
index f45e5bf..d08eb82 100644
--- a/sci-chemistry/gnome-chemistry-utils/ChangeLog
+++ b/sci-chemistry/gnome-chemistry-utils/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gnome-chemistry-utils-9999 (10 Jul 2013)
+
+  10 Jul 2013; Justin Lecher <jlec@gentoo.org>
+  gnome-chemistry-utils-0.14.2.ebuild, +gnome-chemistry-utils-9999.ebuild,
+  +files/gnome-chemistry-utils-0.14.2-extern-c.patch:
+  Add live ebuild, fix extern C problems, #474498 and
+  https://github.com/gentoo-science/sci/issues/84
+
   21 Jun 2013; Justin Lecher <jlec@gentoo.org>
   gnome-chemistry-utils-0.14.2.ebuild, metadata.xml:
   Fix min version of openbabel

diff --git a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch
new file mode 100644
index 0000000..f505af9
--- /dev/null
+++ b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch
@@ -0,0 +1,84 @@
+ goffice/gchemutils-priv.h | 2 +-
+ goffice/gchemutils.cc     | 7 ++++---
+ goffice/gchemutils.h      | 6 +++---
+ goffice/gogcuapp.h        | 2 +-
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/goffice/gchemutils-priv.h b/goffice/gchemutils-priv.h
+index 480e1a5..deb9687 100644
+--- a/goffice/gchemutils-priv.h
++++ b/goffice/gchemutils-priv.h
+@@ -23,12 +23,12 @@
+ #ifndef GOFFICE_GCHEMUTILS_PRIV_H
+ #define GOFFICE_GCHEMUTILS_PRIV_H
+ 
+-#include "gchemutils.h"
+ #include <gcu/chem3ddoc.h>
+ #include <gcu/structs.h>
+ #include <gogcuapp.h>
+ #include <gcu/document.h>
+ #include <gcugtk/window.h>
++#include "gchemutils.h"
+ 
+ struct _GOGChemUtilsComponent
+ {
+diff --git a/goffice/gchemutils.cc b/goffice/gchemutils.cc
+index 2aa85b5..a477b13 100644
+--- a/goffice/gchemutils.cc
++++ b/goffice/gchemutils.cc
+@@ -20,6 +20,10 @@
+  * USA
+  */
+ 
++#include <map>
++#include <string>
++#include <cstring>
++
+ #include "config.h"
+ #include "gchemutils-priv.h"
+ #include "gogcpapp.h"
+@@ -31,9 +35,6 @@
+ #include <goffice/app/module-plugin-defs.h>
+ #include <goffice/component/go-component-factory.h>
+ #include <glib/gi18n-lib.h>
+-#include <map>
+-#include <string>
+-#include <cstring>
+ 
+ //gcuGOfficeApplication *app;
+ 
+diff --git a/goffice/gchemutils.h b/goffice/gchemutils.h
+index 2f62aa5..8e6acb9 100644
+--- a/goffice/gchemutils.h
++++ b/goffice/gchemutils.h
+@@ -23,12 +23,12 @@
+ #ifndef GOFFICE_GCHEMPAINT_H
+ #define GOFFICE_GCHEMPAINT_H
+ 
+-#include <goffice/component/goffice-component.h>
+-#include <goffice/component/go-component.h>
+-
+ extern "C"
+ {
+ 
++#include <goffice/component/goffice-component.h>
++#include <goffice/component/go-component.h>
++
+ typedef struct _GOGChemUtilsComponent GOGChemUtilsComponent;
+ 
+ typedef GOComponentClass GOGChemUtilsComponentClass;
+diff --git a/goffice/gogcuapp.h b/goffice/gogcuapp.h
+index 0012931..0cad715 100644
+--- a/goffice/gogcuapp.h
++++ b/goffice/gogcuapp.h
+@@ -23,9 +23,9 @@
+ #ifndef GO_GCU_APP_H
+ #define GO_GCU_APP_H
+ 
+-#include "gchemutils.h"
+ #include <gcu/structs.h>
+ #include <string>
++#include "gchemutils.h"
+ 
+ namespace gcu {
+ 	class Document;

diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
index e0d8c6a..a761252 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
@@ -5,12 +5,11 @@
 EAPI="5"
 
 GCONF_DEBUG="no"
-inherit gnome2 versionator
+inherit eutils gnome2 versionator
 
 DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
 HOMEPAGE="http://gchemutils.nongnu.org/"
 SRC_URI="http://download.savannah.gnu.org/releases/gchemutils/$(get_version_component_range 1-2)/${P}.tar.bz2"
-RESTRICT="mirror"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -34,6 +33,15 @@ DEPEND="
 	virtual/pkgconfig
 	app-doc/doxygen"
 
+RESTRICT="mirror"
+
+PATCHES=( "${FILESDIR}"/${P}-extern-c.patch )
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	gnome2_src_prepare
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable nls)

diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
similarity index 76%
copy from sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
copy to sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
index e0d8c6a..b6a74ef 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
@@ -5,20 +5,20 @@
 EAPI="5"
 
 GCONF_DEBUG="no"
-inherit gnome2 versionator
+inherit autotools flag-o-matic gnome2 versionator subversion
 
 DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
 HOMEPAGE="http://gchemutils.nongnu.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/gchemutils/$(get_version_component_range 1-2)/${P}.tar.bz2"
-RESTRICT="mirror"
+SRC_URI=""
+ESVN_REPO_URI="svn://svn.savannah.nongnu.org/gchemutils/trunk/gchemutils"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 LICENSE="GPL-3 FDL-1.3"
 IUSE="gnumeric nls"
 
 RDEPEND="
-	>=dev-libs/glib-2.26.0:2
+	>=dev-libs/glib-2.36.0:2
 	>=dev-libs/libxml2-2.4.16:2
 	>=gnome-extra/libgsf-1.14.9
 	>=sci-chemistry/bodr-5
@@ -34,6 +34,15 @@ DEPEND="
 	virtual/pkgconfig
 	app-doc/doxygen"
 
+RESTRICT="mirror"
+
+ESVN_BOOTSTRAP="eautoreconf"
+
+src_prepare() {
+	subversion_src_prepare
+	gnome2_src_prepare
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable nls)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/
@ 2020-09-22 11:59 Aisha Tammy
  0 siblings, 0 replies; 2+ messages in thread
From: Aisha Tammy @ 2020-09-22 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     40142032d92d070e4db0a9aefd95e7f9f2c9e2e0
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 11:57:05 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 11:57:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=40142032

sci-chemistry/gnome-chemistry-utils: drop package

present in ::gentoo

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 .../gnome-chemistry-utils-0.14.2-extern-c.patch    | 84 ----------------------
 .../gnome-chemistry-utils-0.14.2-r1.ebuild         | 45 ------------
 .../gnome-chemistry-utils-9999.ebuild              | 52 --------------
 sci-chemistry/gnome-chemistry-utils/metadata.xml   | 11 ---
 4 files changed, 192 deletions(-)

diff --git a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch
deleted file mode 100644
index f505af970..000000000
--- a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch
+++ /dev/null
@@ -1,84 +0,0 @@
- goffice/gchemutils-priv.h | 2 +-
- goffice/gchemutils.cc     | 7 ++++---
- goffice/gchemutils.h      | 6 +++---
- goffice/gogcuapp.h        | 2 +-
- 4 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/goffice/gchemutils-priv.h b/goffice/gchemutils-priv.h
-index 480e1a5..deb9687 100644
---- a/goffice/gchemutils-priv.h
-+++ b/goffice/gchemutils-priv.h
-@@ -23,12 +23,12 @@
- #ifndef GOFFICE_GCHEMUTILS_PRIV_H
- #define GOFFICE_GCHEMUTILS_PRIV_H
- 
--#include "gchemutils.h"
- #include <gcu/chem3ddoc.h>
- #include <gcu/structs.h>
- #include <gogcuapp.h>
- #include <gcu/document.h>
- #include <gcugtk/window.h>
-+#include "gchemutils.h"
- 
- struct _GOGChemUtilsComponent
- {
-diff --git a/goffice/gchemutils.cc b/goffice/gchemutils.cc
-index 2aa85b5..a477b13 100644
---- a/goffice/gchemutils.cc
-+++ b/goffice/gchemutils.cc
-@@ -20,6 +20,10 @@
-  * USA
-  */
- 
-+#include <map>
-+#include <string>
-+#include <cstring>
-+
- #include "config.h"
- #include "gchemutils-priv.h"
- #include "gogcpapp.h"
-@@ -31,9 +35,6 @@
- #include <goffice/app/module-plugin-defs.h>
- #include <goffice/component/go-component-factory.h>
- #include <glib/gi18n-lib.h>
--#include <map>
--#include <string>
--#include <cstring>
- 
- //gcuGOfficeApplication *app;
- 
-diff --git a/goffice/gchemutils.h b/goffice/gchemutils.h
-index 2f62aa5..8e6acb9 100644
---- a/goffice/gchemutils.h
-+++ b/goffice/gchemutils.h
-@@ -23,12 +23,12 @@
- #ifndef GOFFICE_GCHEMPAINT_H
- #define GOFFICE_GCHEMPAINT_H
- 
--#include <goffice/component/goffice-component.h>
--#include <goffice/component/go-component.h>
--
- extern "C"
- {
- 
-+#include <goffice/component/goffice-component.h>
-+#include <goffice/component/go-component.h>
-+
- typedef struct _GOGChemUtilsComponent GOGChemUtilsComponent;
- 
- typedef GOComponentClass GOGChemUtilsComponentClass;
-diff --git a/goffice/gogcuapp.h b/goffice/gogcuapp.h
-index 0012931..0cad715 100644
---- a/goffice/gogcuapp.h
-+++ b/goffice/gogcuapp.h
-@@ -23,9 +23,9 @@
- #ifndef GO_GCU_APP_H
- #define GO_GCU_APP_H
- 
--#include "gchemutils.h"
- #include <gcu/structs.h>
- #include <string>
-+#include "gchemutils.h"
- 
- namespace gcu {
- 	class Document;

diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2-r1.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2-r1.ebuild
deleted file mode 100644
index 74b6741ec..000000000
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no"
-inherit eutils gnome2 versionator
-
-DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
-HOMEPAGE="http://gchemutils.nongnu.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/gchemutils/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3 FDL-1.3"
-IUSE="gnumeric nls"
-
-RDEPEND="
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-libs/glib-2.26.0:2
-	>=dev-libs/libxml2-2.4.16:2
-	>=gnome-extra/libgsf-1.14.9
-	>=sci-chemistry/bodr-5
-	>=sci-chemistry/chemical-mime-data-0.1.94
-	>=sci-chemistry/openbabel-2.3.0
-	>=x11-libs/cairo-1.6.0
-	>=x11-libs/gdk-pixbuf-2.22.0
-	>=x11-libs/goffice-0.10.4
-	x11-libs/gtk+:3
-	>=x11-libs/libX11-1.0.0
-	gnumeric? ( >=app-office/gnumeric-1.11.6 )"
-DEPEND="
-	virtual/pkgconfig
-	app-doc/doxygen"
-
-RESTRICT="mirror"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-mozilla-plugin
-		--disable-update-databases
-	)
-	gnome2_src_configure ${myeconfargs[@]}
-}

diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
deleted file mode 100644
index 98af45ada..000000000
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no"
-inherit autotools flag-o-matic gnome2 versionator subversion
-
-DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
-HOMEPAGE="http://gchemutils.nongnu.org/"
-SRC_URI=""
-ESVN_REPO_URI="svn://svn.savannah.nongnu.org/gchemutils/trunk/gchemutils"
-
-SLOT="0"
-KEYWORDS=""
-LICENSE="GPL-3 FDL-1.3"
-IUSE="gnumeric nls"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=dev-libs/libxml2-2.4.16:2
-	>=gnome-extra/libgsf-1.14.9
-	>=sci-chemistry/bodr-5
-	>=sci-chemistry/chemical-mime-data-0.1.94
-	>=sci-chemistry/openbabel-2.3.0
-	>=x11-libs/cairo-1.6.0
-	>=x11-libs/gdk-pixbuf-2.22.0
-	>=x11-libs/goffice-0.10.4
-	x11-libs/gtk+:3
-	>=x11-libs/libX11-1.0.0
-	gnumeric? ( >=app-office/gnumeric-1.11.6 )"
-DEPEND="
-	virtual/pkgconfig
-	app-doc/doxygen"
-
-RESTRICT="mirror"
-
-ESVN_BOOTSTRAP="eautoreconf"
-
-src_prepare() {
-	subversion_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-mozilla-plugin
-		--disable-update-databases
-	)
-	gnome2_src_configure ${myeconfargs[@]}
-}

diff --git a/sci-chemistry/gnome-chemistry-utils/metadata.xml b/sci-chemistry/gnome-chemistry-utils/metadata.xml
deleted file mode 100644
index c6cbb8582..000000000
--- a/sci-chemistry/gnome-chemistry-utils/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-The Gnome Chemistry Utils provide some programs and library containing
-GTK widgets and some C++ classes related to chemistry. 
-</longdescription>
-	<use>
-		<flag name="gnumeric">Build pluging for gnumeric</flag>
-	</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-09-22 11:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-10 16:02 [gentoo-commits] proj/sci:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2020-09-22 11:59 Aisha Tammy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox