net-misc/googlecl: remove conflicting ebuilds.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: AstroFloyd <AstroFloyd@gmail.com>

4 files changed, 7 insertions, 104 deletions

diff --git a/net-misc/googlecl/ChangeLog b/net-misc/googlecl/ChangeLog
index 1981061..f54825c 100644
--- a/net-misc/googlecl/ChangeLog
+++ b/net-misc/googlecl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-misc/googlecl
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2021 Gentoo Authors; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/googlecl/ChangeLog,v 1.14 2015/04/21 00:57:56 mrueg Exp $
 
+  05 Feb 2021; AstroFloyd <AstroFloyd@gmail.com>
+  -files/googlecl-0.9.12-calendar_dates.patch, -googlecl-0.9.15-r1.ebuild:
+  net-misc/googlecl: remove conflicting ebuilds.
+
 *googlecl-0.9.15 (25 Sep 2015)
 
   25 Sep 2015; AstroFloyd <AstroFloyd@gmail.com> +googlecl-0.9.15.ebuild,
diff --git a/net-misc/googlecl/Manifest b/net-misc/googlecl/Manifest
index f920950..ed3bed5 100644
--- a/net-misc/googlecl/Manifest
+++ b/net-misc/googlecl/Manifest
@@ -1,5 +1,2 @@
-AUX googlecl-0.9.12-calendar_dates.patch 2767 SHA256 5f44aa92b872c9546984a0fd14f5c62b4a6c2d4b4ea201145085be7f43cbb9f3 SHA512 35c16b04fd9291ee4f2502f753e2039e968adfd314b6fe96c2a0d3a24c5090d0c7ee7e8ded45d52f1933960ccf1746437e80ab63371a47ea3b5def27596f54d4 WHIRLPOOL b229bc898111ff529a55452690e23505239b78cdbb0786d59c58e82b19fe56913d5c5f9160e8faf206f48d561d0bf4169dc64b4636b03548072ac5abe3b637e5
-DIST v0.9.15.tar.gz 387173 SHA256 4e4f1d9da9a702e8fdf7cd9df9c912e8738052a3d22ece1f11dc4e17540cce5a SHA512 72925cf325e3afd8a4f03ab457c6ea969e3c13e62fd8b045e34e01a6b7515d426d5f022a4cc95474cdc46199fdb7b9bd5839071e52352e94f18d70167845489a WHIRLPOOL 42b2e636c3d432f2cd009339f63a8159f8ee0f6c9cd581eaedebb4796f06b84099f0d4fd12d8134452c484842f4af5ea363e033cfdbbc30e495cf67dffd92a51
-EBUILD googlecl-0.9.15-r1.ebuild 674 SHA256 4105438d8fa9efc35329971b7528f232c24130f22f8091931c9ef161761b15df SHA512 b866a64a3c1116de239810c9b47db076cb9470b3c6d2a2fb10cf61cc786831707bf69c10c4f913f0bd081cd67c8e51f5b965c9d330510e39cc818ff924d0ffea WHIRLPOOL 1feb8a614853c64263192878bff2a5ff004ddca586340f176b74a6fc8030bce23e83767898089fccb4725e913f8734add6ee08946ab712a1a179ec691afc463d
-MISC ChangeLog 2514 SHA256 d12ec447c1dd8712dd32ca6f53e622cc332b85afd5a4b8a81ae0227c68576943 SHA512 b6546429c4ecb49714e43fccef3b487a7c0e002a8bfb355115a1dc7b80395be371812443566329cd060ae9c77dbbd2a8b1319eb2649157a84de566883e48d566 WHIRLPOOL bb58854b5eaca2c95df3abda468b5a20d0e8b88734320852b9f29fd3d4360ef52e053ab60cff108dcb5736f066670461bfe07f91333402f00d9048175206a230
-MISC metadata.xml 447 SHA256 6fe7891191690d893e755700c7026eac21c69eaab631bbb18ac29ff160138479 SHA512 93f8bfe3cf11756e7e1e0cbaada84e484438b3421cec28e8ffb0ca7394ba84649d65a1615d0dae8326ce74c4cce216233d5cde99f27a0d4162fc9ef4373b6430 WHIRLPOOL d1107d7c9bb974634efddedf24f9c15739637e618785daa35055cd4c840cf606a8c2fada9a0fcb82051eda0d08f9cfd99bc5365b8310fed13baee972f65fc8ea
+MISC ChangeLog 2685 BLAKE2B e53ae3c37832af1fa033f6b2379af394391fa188684da88ae587554737ed74a7253828c96966652d9af8f2222e7e7f3ecd7c6c9a22883dd031bf5e6bb6ef7954 SHA512 6e5bde1d2d704e0787566e7d46948d225de5ef937b1481dae6b8f98fd8e7f94ec47906ce0419433c8251412bb979870ed5571ffec7d7710eaeb09c4f24506cdc
+MISC metadata.xml 447 BLAKE2B c3e625723bab24b2e21b4529803f4d2ce601c12d0644e6e4d0ccb6a38f2f7ba59e9bc94d10231be3ee49956c7953e1b3c0972d8c3d636d50b74e923f210ceba0 SHA512 93f8bfe3cf11756e7e1e0cbaada84e484438b3421cec28e8ffb0ca7394ba84649d65a1615d0dae8326ce74c4cce216233d5cde99f27a0d4162fc9ef4373b6430
diff --git a/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch b/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch
deleted file mode 100644
index 83897bb..0000000
--- a/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-fix "when" field in calendar not showing dates
-
-http://bugs.gentoo.org/show_bug.cgi?id=355913
-http://code.google.com/p/googlecl/issues/detail?id=358
-
-Index: googlecl/base.py
-===================================================================
---- src/googlecl/base.py	(revision 527)
-+++ src/googlecl/base.py	(working copy)
-@@ -673,10 +673,12 @@
-     except ValueError, err:
-       LOG.debug(err.args[0] + ' (Did not add value for field ' + attr + ')')
-     except AttributeError, err:
-+      LOG.debug(err.args[0] + ' (value for field ' + attr + ')')
-       try:
-         # Last ditch effort to blindly grab the attribute
-         val = getattr(wrapped_entry.entry, attr).text or missing_field_value
-       except AttributeError:
-+        LOG.debug(err.args[0] + ' (value for field ' + attr + ')')
-         val = missing_field_value
-     # Apparently, atom(?) doesn't always return a Unicode type when there are
-     # non-latin characters, so force everything to Unicode.
-Index: googlecl/calendar/__init__.py
-===================================================================
---- src/googlecl/calendar/__init__.py	(revision 527)
-+++ src/googlecl/calendar/__init__.py	(working copy)
-@@ -235,12 +235,22 @@
- 
- 
- class CalendarEntryToStringWrapper(googlecl.base.BaseEntryToStringWrapper):
-+  def __init__(self, entry, config):
-+    """Initialize a CalendarEntry wrapper.
-+
-+    Args:
-+      entry: CalendarEntry to interpret to strings.
-+      config: Configuration parser. Needed for some values.
-+    """
-+    googlecl.base.BaseEntryToStringWrapper.__init__(self, entry)
-+    self.config_parser = config
-+
-   @property
-   def when(self):
-     """When event takes place."""
-     start_date, end_date, freq = get_datetimes(self.entry)
--    print_format = googlecl.CONFIG.lazy_get(SECTION_HEADER,
--                                            'date_print_format')
-+    print_format = self.config_parser.lazy_get(SECTION_HEADER,
-+                                                      'date_print_format')
-     start_text = time.strftime(print_format, start_date)
-     end_text = time.strftime(print_format, end_date)
-     value = start_text + ' - ' + end_text
-@@ -277,9 +287,9 @@
- 
-     for entry in single_events:
-       print googlecl.base.compile_entry_string(
--                                            CalendarEntryToStringWrapper(entry),
--                                            options.fields.split(','),
--                                            delimiter=options.delimiter)
-+                            CalendarEntryToStringWrapper(entry, client.config),
-+                            options.fields.split(','),
-+                            delimiter=options.delimiter)
- 
- 
- #===============================================================================
diff --git a/net-misc/googlecl/googlecl-0.9.15-r1.ebuild b/net-misc/googlecl/googlecl-0.9.15-r1.ebuild
deleted file mode 100644
index 24c828e..0000000
--- a/net-misc/googlecl/googlecl-0.9.15-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_DEPEND="2:2.7"
-
-inherit distutils-r1
-
-DESCRIPTION="Command line tools for the Google Data APIs"
-HOMEPAGE="https://github.com/vinitkumar/googlecl"
-SRC_URI="https://github.com/vinitkumar/${PN}/archive/v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~arm-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-python/gdata
-"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_install() {
-	distutils_src_install
-
-	dodoc changelog    || die "dodoc failed"
-	doman docs/man/*.1 || die "doman failed"
-}