commit:     af70895aced63d749b9df536836851152357c213
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 02:37:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 02:37:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af70895a

mail-client/etpan-ng: treeclean

Bug: https://bugs.gentoo.org/699570
Bug: https://bugs.gentoo.org/448574
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/etpan-ng/Manifest                      |  1 -
 mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild      | 37 --------------
 .../etpan-ng/files/etpan-ng-0.7.1-as-needed.patch  | 58 ----------------------
 .../etpan-ng/files/etpan-ng-0.7.1-tinfo.patch      | 10 ----
 mail-client/etpan-ng/metadata.xml                  |  8 ---
 profiles/package.mask                              |  6 ---
 6 files changed, 120 deletions(-)

diff --git a/mail-client/etpan-ng/Manifest b/mail-client/etpan-ng/Manifest
deleted file mode 100644
index 91262e4ea58..00000000000
--- a/mail-client/etpan-ng/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST etpan-ng-0.7.1.tar.gz 364394 BLAKE2B 
7ed1de331a85dbebf133af25a36ee312d9fe021c36c1625a4807ab38ffc056803672b322e3d28b926f44ce51d679b0e7fa9f3130660c4742282a651011ed3c73
 SHA512 
e56ca50030516a0a35d2471505ce2c2ef94abb8f640a896bac0bc2cdaac65af38f69efd5f52219576df0a50d8bea92716c6dae5f4cf06fbd2a722bf768681493

diff --git a/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild 
b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
deleted file mode 100644
index 507b0eabece..00000000000
--- a/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="etPan is a console mail client that is based on libEtPan"
-HOMEPAGE="http://www.etpan.org/other.html";
-SRC_URI="mirror://sourceforge/libetpan/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="debug ldap"
-
-RDEPEND=">=net-libs/libetpan-0.35
-       sys-libs/ncurses:=
-       ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-       virtual/yacc"
-PATCHES=(
-       "${FILESDIR}"/${P}-as-needed.patch
-       "${FILESDIR}"/${P}-tinfo.patch
-)
-DOCS=(
-       Changelog NEWS README TODO contrib/etpan-make-vtree.pl doc/CONFIG
-       doc/INTERNAL
-)
-
-src_prepare() {
-       default
-       sed -i -e "s:@bindir@:${D}/@bindir@:" src/Makefile.in || die
-       eautoreconf
-}
-
-src_configure() {
-       econf --disable-debug
-}

diff --git a/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch 
b/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch
deleted file mode 100644
index c17cc10cea9..00000000000
--- a/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -11,18 +11,25 @@
- libetpan_major_required=0
- libetpan_minor_required=42
- 
--debug=no
-+AC_MSG_CHECKING(whether debug flag was used)
- AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for 
debugging (default=no)],
--debug=yes
--CFLAGS="$CFLAGS -O2 -W -Wall -g"
--LDFLAGS="$LDFLAGS",)
-+      [enable_debug=$enableval],[enable_debug="no"])
-+AC_MSG_RESULT($enable_debug)
-+if test "$enable_debug" = "yes"; then
-+      CFLAGS="$CFLAGS -O2 -W -Wall -g"
-+      LDFLAGS="$LDFLAGS"
-+fi
-+
- AC_ARG_ENABLE(optim,   [  --enable-optim          setup flags (gcc) for 
optimizations (default=no)],
--if test "x$enable_debug" != "xyes" ; then
--  CFLAGS="$CFLAGS -O3 -g0"
--  LDFLAGS="$LDFLAGS -s"
-+      [enable_optim=$enableval],[enable_debug="no"])
-+if test "$enable_debug" != "yes"; then 
-+  if test "$enable_optim" = "yes"; then
-+    CFLAGS="$CFLAGS -O3 -g0"
-+    LDFLAGS="$LDFLAGS -s"
-+  fi
- else
-   AC_MSG_WARN([enable-optim and enable-debug are incompatible -- disabling 
optimizations])
--fi,)
-+fi
- 
- AC_CONFIG_HEADER(config.h)
- 
-@@ -67,10 +74,10 @@
-   if test "x$checkpthread" = "xyes"; then
-     AC_MSG_CHECKING([for pthread_create with -$flag])
-     OLDFLAGS="$LDFLAGS"
--    LDFLAGS="-$flag $LDFLAGS"
-+    LDFLAGS="$LDFLAGS -$flag"
-     AC_TRY_LINK([], [pthread_create();], 
-                     [pthflag=yes; checkpthread=no], 
--                    [pthflag=no; LDFLAGS="$OLDCFLAGS"])
-+                    [pthflag=no; LDFLAGS="$OLDFLAGS"])
-     AC_MSG_RESULT($pthflag)
-   fi
- done
-@@ -127,7 +134,7 @@
-   AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan=yes])
-   if test "x$libetpan" = "xyes"; then
-     AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
--    LDFLAGS="$LDFLAGS `$libetpanconfig --libs 2>/dev/null`"
-+    LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
-     AC_TRY_LINK([], [db_mailstorage_init();], [libetpan=yes], [libetpan=no])
-     AC_MSG_RESULT([$libetpan])
-   fi

diff --git a/mail-client/etpan-ng/files/etpan-ng-0.7.1-tinfo.patch 
b/mail-client/etpan-ng/files/etpan-ng-0.7.1-tinfo.patch
deleted file mode 100644
index 2f62659b906..00000000000
--- a/mail-client/etpan-ng/files/etpan-ng-0.7.1-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -125,6 +125,7 @@
- AC_CHECK_HEADER(ncurses.h, [ncurses=yes])
- test "x$ncurses" = "xyes" && AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS 
-lncurses"; ncurses=yes], [ncurses=no])
- test "x$ncurses" = "xno" && AC_MSG_ERROR([ncurses support required])
-+AC_SEARCH_LIBS(curs_set, ncurses tinfo)
- 
- dnl Libetpan
- libetpan=no

diff --git a/mail-client/etpan-ng/metadata.xml 
b/mail-client/etpan-ng/metadata.xml
deleted file mode 100644
index ebec101d4a6..00000000000
--- a/mail-client/etpan-ng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <!-- maintainer-needed -->
-       <upstream>
-               <remote-id type="sourceforge">libetpan</remote-id>
-       </upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 705b6799186..f0e46bf5358 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -399,12 +399,6 @@ media-gfx/povtree
 >=dev-lang/ocaml-4.12
 =dev-ml/camlp4-4.12
 
-# Sam James <s...@gentoo.org> (2021-06-10)
-# Fails to build with modern libetpan. Unmaintained.
-# See bug #699570, bug #448574.
-# Removal on 2021-07-10.
-mail-client/etpan-ng
-
 # Michał Górny <mgo...@gentoo.org> (2021-06-05)
 # A backport for 'older Python versions' with no revdeps.
 # Removal on 2021-07-05.  Bug #794268.

Reply via email to