* [gentoo-commits] repo/gentoo:master commit in: net-libs/meanwhile/, net-libs/meanwhile/files/
@ 2020-02-09 18:50 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-02-09 18:50 UTC (permalink / raw
To: gentoo-commits
commit: f01c3a1606d40331738dde1fa5ca75d17b09cfb6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 18:49:36 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 18:49:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01c3a16
net-libs/meanwhile: Port to EAPI 7
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/meanwhile-1.0.2-gentoo-fhs-samples.patch | 26 +++++++++++
net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild | 50 +++++++++++++---------
2 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch
new file mode 100644
index 00000000000..d0bfc20fa76
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch
@@ -0,0 +1,26 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -5,10 +5,10 @@
+ if ENABLE_DOXYGEN
+
+ htmldoc_DATA = html/*
+-htmldocdir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/html
++htmldocdir = $(htmldir)
+
+ latexdoc_DATA = latex/*
+-latexdocdir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/latex
++latexdocdir = $(docdir)/latex
+
+ docdata = $(htmldoc_DATA) $(latexdoc_DATA)
+
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -19,7 +19,7 @@
+ $(SAMPLES_SRC)
+
+
+-sampledir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/samples
++sampledir = $(docdir)/samples
+
+
+ EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS)
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
index 7a2a8a62459..7d3f3864519 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -1,45 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit eutils flag-o-matic
+EAPI=7
+
+inherit autotools flag-o-matic
DESCRIPTION="Meanwhile (Sametime protocol) library"
HOMEPAGE="http://meanwhile.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
-IUSE="doc debug"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="doc debug"
-RDEPEND=">=dev-libs/glib-2:2"
-
-DEPEND="${RDEPEND}
- dev-libs/gmp
+RDEPEND="dev-libs/glib:2"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/gmp"
+BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )"
-src_prepare(){
- epatch "${FILESDIR}/${P}-presence.patch" #239144
- epatch "${FILESDIR}/${P}-glib2.31.patch" #409081
-
- #241298
- sed -i -e "/sampledir/ s:-doc::" samples/Makefile.in || die
+PATCHES=(
+ # bug 239144
+ "${FILESDIR}"/${P}-presence.patch
+ # bug 409081
+ "${FILESDIR}"/${P}-glib2.31.patch
+ # bug 241298
+ "${FILESDIR}"/${P}-gentoo-fhs-samples.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
}
src_configure() {
- append-flags "-fno-tree-vrp"
- local myconf
- use doc || myconf="${myconf} --enable-doxygen=no"
+ append-cflags -fno-tree-vrp
- econf ${myconf} \
+ econf \
--disable-static \
+ --enable-doxygen=$(usex doc) \
$(use_enable debug)
}
src_install() {
- emake DESTDIR="${D}" install
- find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
- dodoc AUTHORS ChangeLog NEWS README TODO
+ default
+
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/meanwhile/, net-libs/meanwhile/files/
@ 2024-12-26 8:04 Petr Vaněk
0 siblings, 0 replies; 2+ messages in thread
From: Petr Vaněk @ 2024-12-26 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 8e0a6bfebd87bf43e7bf3a3aa59c65b7373c4735
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 08:02:52 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 08:04:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0a6bfe
net-libs/meanwhile: drop 1.0.2-r1
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
net-libs/meanwhile/Manifest | 1 -
.../meanwhile/files/meanwhile-1.0.2-glib2.31.patch | 213 ---------------------
.../meanwhile/files/meanwhile-1.0.2-presence.patch | 42 ----
net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild | 53 -----
4 files changed, 309 deletions(-)
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index d8c44b440353..02fc84fbf09e 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,2 +1 @@
-DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
DIST meanwhile-1.1.1.tar.gz 180449 BLAKE2B ec4c2a4713f78b6e780f4b7c64b0efbde98275643814010fca995cedb49e7141a0d3065807cab19b78ef9d9813ebc91e2dcf7ee1abc956df91c64af5a7e2aa45 SHA512 89ddb1711ee5c5f5ec2e47b47e4eaf4623b5638a121a87bc905f86b201af753a2689b68ec8397a7cd1578a5a773a289bbe53f38acde2bf0598ce3f25c0dd645c
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
deleted file mode 100644
index 4ffcc3672fc7..000000000000
--- a/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -uNr meanwhile-1.0.2/src/channel.c meanwhile-1.0.2-r1/src/channel.c
---- meanwhile-1.0.2/src/channel.c 2005-12-08 23:04:46.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/channel.c 2012-03-20 21:15:03.000000000 +0100
-@@ -19,8 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- #include <string.h>
-
- #include "mw_channel.h"
-diff -uNr meanwhile-1.0.2/src/mw_debug.c meanwhile-1.0.2-r1/src/mw_debug.c
---- meanwhile-1.0.2/src/mw_debug.c 2005-12-03 04:46:10.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_debug.c 2012-03-20 21:12:09.000000000 +0100
-@@ -19,7 +19,7 @@
- */
-
-
--#include <glib/gstring.h>
-+#include <glib.h>
-
- #include "mw_debug.h"
-
-diff -uNr meanwhile-1.0.2/src/mw_message.h meanwhile-1.0.2-r1/src/mw_message.h
---- meanwhile-1.0.2/src/mw_message.h 2005-12-15 01:30:28.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_message.h 2012-03-20 21:06:28.000000000 +0100
-@@ -22,7 +22,7 @@
- #define _MW_MESSAGE_H
-
-
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
-
-
-diff -uNr meanwhile-1.0.2/src/mw_srvc_conf.h meanwhile-1.0.2-r1/src/mw_srvc_conf.h
---- meanwhile-1.0.2/src/mw_srvc_conf.h 2005-12-15 01:30:28.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_srvc_conf.h 2012-03-20 21:08:01.000000000 +0100
-@@ -22,7 +22,7 @@
- #define _MW_SRVC_CONF_H
-
-
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
-
-
-diff -uNr meanwhile-1.0.2/src/mw_srvc_dir.h meanwhile-1.0.2-r1/src/mw_srvc_dir.h
---- meanwhile-1.0.2/src/mw_srvc_dir.h 2005-12-15 01:30:28.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_srvc_dir.h 2012-03-20 21:08:23.000000000 +0100
-@@ -22,7 +22,6 @@
-
-
- #include <glib.h>
--#include <glib/glist.h>
-
-
- #ifdef __cplusplus
-diff -uNr meanwhile-1.0.2/src/mw_srvc_place.h meanwhile-1.0.2-r1/src/mw_srvc_place.h
---- meanwhile-1.0.2/src/mw_srvc_place.h 2005-12-15 01:30:28.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_srvc_place.h 2012-03-20 21:09:51.000000000 +0100
-@@ -22,7 +22,7 @@
- #define _MW_SRVC_PLACE_H
-
-
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
-
-
-diff -uNr meanwhile-1.0.2/src/mw_srvc_resolve.h meanwhile-1.0.2-r1/src/mw_srvc_resolve.h
---- meanwhile-1.0.2/src/mw_srvc_resolve.h 2005-12-15 01:30:28.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_srvc_resolve.h 2012-03-20 21:10:54.000000000 +0100
-@@ -23,7 +23,6 @@
-
-
- #include <glib.h>
--#include <glib/glist.h>
-
-
- #ifdef __cplusplus
-diff -uNr meanwhile-1.0.2/src/mw_st_list.h meanwhile-1.0.2-r1/src/mw_st_list.h
---- meanwhile-1.0.2/src/mw_st_list.h 2005-12-15 01:30:28.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_st_list.h 2012-03-20 21:11:27.000000000 +0100
-@@ -30,7 +30,6 @@
-
-
- #include <glib.h>
--#include <glib/glist.h>
- #include "mw_common.h"
-
-
-diff -uNr meanwhile-1.0.2/src/mw_util.h meanwhile-1.0.2-r1/src/mw_util.h
---- meanwhile-1.0.2/src/mw_util.h 2004-12-28 21:41:26.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/mw_util.h 2012-03-20 21:06:54.000000000 +0100
-@@ -23,8 +23,6 @@
-
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
-
-
- #define map_guint_new() \
-diff -uNr meanwhile-1.0.2/src/srvc_aware.c meanwhile-1.0.2-r1/src/srvc_aware.c
---- meanwhile-1.0.2/src/srvc_aware.c 2005-12-08 23:02:11.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/srvc_aware.c 2012-03-20 21:07:22.000000000 +0100
-@@ -19,8 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- #include <string.h>
-
- #include "mw_channel.h"
-diff -uNr meanwhile-1.0.2/src/srvc_conf.c meanwhile-1.0.2-r1/src/srvc_conf.c
---- meanwhile-1.0.2/src/srvc_conf.c 2005-12-28 03:46:54.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/srvc_conf.c 2012-03-20 21:07:42.000000000 +0100
-@@ -19,8 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -uNr meanwhile-1.0.2/src/srvc_dir.c meanwhile-1.0.2-r1/src/srvc_dir.c
---- meanwhile-1.0.2/src/srvc_dir.c 2005-09-15 22:30:20.000000000 +0200
-+++ meanwhile-1.0.2-r1/src/srvc_dir.c 2012-03-20 21:08:44.000000000 +0100
-@@ -18,7 +18,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <glib/ghash.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_common.h"
-diff -uNr meanwhile-1.0.2/src/srvc_ft.c meanwhile-1.0.2-r1/src/srvc_ft.c
---- meanwhile-1.0.2/src/srvc_ft.c 2005-09-15 22:30:37.000000000 +0200
-+++ meanwhile-1.0.2-r1/src/srvc_ft.c 2012-03-20 21:09:05.000000000 +0100
-@@ -19,7 +19,7 @@
- */
-
-
--#include <glib/glist.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_common.h"
-diff -uNr meanwhile-1.0.2/src/srvc_im.c meanwhile-1.0.2-r1/src/srvc_im.c
---- meanwhile-1.0.2/src/srvc_im.c 2005-12-28 03:46:54.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/srvc_im.c 2012-03-20 21:09:31.000000000 +0100
-@@ -19,7 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/glist.h>
- #include <string.h>
-
- #include "mw_channel.h"
-diff -uNr meanwhile-1.0.2/src/srvc_place.c meanwhile-1.0.2-r1/src/srvc_place.c
---- meanwhile-1.0.2/src/srvc_place.c 2005-12-03 03:00:29.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/srvc_place.c 2012-03-20 21:10:05.000000000 +0100
-@@ -19,8 +19,7 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
-+
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -uNr meanwhile-1.0.2/src/srvc_resolve.c meanwhile-1.0.2-r1/src/srvc_resolve.c
---- meanwhile-1.0.2/src/srvc_resolve.c 2005-10-27 02:10:06.000000000 +0200
-+++ meanwhile-1.0.2-r1/src/srvc_resolve.c 2012-03-20 21:10:21.000000000 +0100
-@@ -18,7 +18,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <glib/ghash.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_common.h"
-diff -uNr meanwhile-1.0.2/src/srvc_store.c meanwhile-1.0.2-r1/src/srvc_store.c
---- meanwhile-1.0.2/src/srvc_store.c 2005-11-19 02:52:42.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/srvc_store.c 2012-03-20 21:11:13.000000000 +0100
-@@ -18,7 +18,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <glib/glist.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_debug.h"
-diff -uNr meanwhile-1.0.2/src/st_list.c meanwhile-1.0.2-r1/src/st_list.c
---- meanwhile-1.0.2/src/st_list.c 2005-12-08 23:01:27.000000000 +0100
-+++ meanwhile-1.0.2-r1/src/st_list.c 2012-03-20 21:11:44.000000000 +0100
-@@ -20,7 +20,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <glib/gstring.h>
-+#include <glib.h>
-
- #include "mw_debug.h"
- #include "mw_util.h"
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch
deleted file mode 100644
index e01089eda91c..000000000000
--- a/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# User Mikael Berthe <mikael.berthe@lilotux.net>
-# Date 1194208892 -3600
-Fix Awareness Snapshots with recent Sametime servers
-
-With recent Sametime servers there seem to be 2 bytes
-after the Snapshot Message Blocks.
-This patch tries to use the end of block offset provided
-by the server.
-
-diff -r be8d8f1d3ebc src/common.c
---- a/src/common.c Sun Nov 04 18:48:00 2007 +0100
-+++ b/src/common.c Tue Nov 06 11:46:26 2007 +0100
-@@ -878,23 +878,24 @@ gboolean mwAwareIdBlock_equal(const stru
- /* 8.4.2.4 Snapshot */
-
- void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) {
-- guint32 junk;
-- char *empty = NULL;
-+ guint32 end_of_block;
-
- g_return_if_fail(b != NULL);
- g_return_if_fail(idb != NULL);
-
-- guint32_get(b, &junk);
-+ guint32_get(b, &end_of_block);
- mwAwareIdBlock_get(b, &idb->id);
- mwString_get(b, &idb->group);
- gboolean_get(b, &idb->online);
--
-- g_free(empty);
-
- if(idb->online) {
- mwString_get(b, &idb->alt_id);
- mwUserStatus_get(b, &idb->status);
- mwString_get(b, &idb->name);
-+ }
-+
-+ if( b->ptr < b->buf + end_of_block ) {
-+ mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr);
- }
- }
-
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
deleted file mode 100644
index 35f9de1f3477..000000000000
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Meanwhile (Sametime protocol) library"
-HOMEPAGE="http://meanwhile.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="doc debug"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="
- ${RDEPEND}
- dev-libs/gmp"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-text/doxygen )"
-
-PATCHES=(
- # bug 239144
- "${FILESDIR}"/${P}-presence.patch
- # bug 409081
- "${FILESDIR}"/${P}-glib2.31.patch
- # bug 241298
- "${FILESDIR}"/${P}-gentoo-fhs-samples.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cflags -fno-tree-vrp
-
- econf \
- --disable-static \
- --enable-doxygen=$(usex doc) \
- $(use_enable debug)
-}
-
-src_install() {
- default
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-26 8:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-26 8:04 [gentoo-commits] repo/gentoo:master commit in: net-libs/meanwhile/, net-libs/meanwhile/files/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2020-02-09 18:50 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox