commit: 1b9505bdef2e55dd510b5ac4ff2fac300d1a12e7
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 02:19:12 2024 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 02:20:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9505bd
net-misc/mikutter: bump to 5.0.5; add ruby32
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
net-misc/mikutter/Manifest | 2 +
...{mikutter-9999.ebuild => mikutter-5.0.5.ebuild} | 57 ++++++----------------
net-misc/mikutter/mikutter-9999.ebuild | 57 ++++++----------------
3 files changed, 30 insertions(+), 86 deletions(-)
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 1f8b11a219f9..021510194bfe 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,2 +1,4 @@
+DIST 1585-use-own-blowfish-impl.patch 41698 BLAKE2B
c7e62ee5e9d362e7bc103468f4be9a9e49715de63905ca1b2022f01af1bc7f143b46f69f4f73b34bc4f6ba8589ccd138822876c35b7061f0458ee4206aaf6941
SHA512
cddab2449c16b64bc12d272b9302eba01d3e80dfa1d9ade9b125d46508bdc49eb1b4990b25f43c915f76d3e3d4b669a9d5a6b09fbfb6e845690b39d336f120a0
DIST mikutter-5.0.4.tar.gz 2378972 BLAKE2B
58101e91a8d8aeaf71e2bc58a421d0543f864c66c5ea313734ca242bce8115c70a036f6db109670cdb76cbd698d6d0569872c16eeb9eed15d1fd951aabccb35a
SHA512
30e8b24af56e38fabeb454d4ea3f6a20b11e7836527f68e61f26f164fed0c2028b29db20c21397b2203fe23fceaef2e92a481d734692da3869dfcedcae2a58e0
+DIST mikutter-5.0.5.tar.gz 2379037 BLAKE2B
455109764e76b19298a0408c51a109f0c3b3b5b2f1b1ffcb59cee6d3fc449c754d8420ea37df2a005d36f3ab4447bbf7f6a7affe934852d07594cbe430cbffed
SHA512
8b7d178400b0d7cb674297f9109832e1a19563d35e985636a42028df2414973819ef49b39f80e1a51cf1964634062656dc2071ba8d934083ce327e0a9f3adf28
DIST twitter_api_keys.rb 336 BLAKE2B
9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703
SHA512
39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
diff --git a/net-misc/mikutter/mikutter-9999.ebuild
b/net-misc/mikutter/mikutter-5.0.5.ebuild
similarity index 56%
copy from net-misc/mikutter/mikutter-9999.ebuild
copy to net-misc/mikutter/mikutter-5.0.5.ebuild
index 0d3a72a482ca..65013295fed7 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-5.0.5.ebuild
@@ -1,33 +1,40 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby31"
+USE_RUBY="ruby31 ruby32"
inherit desktop ruby-ng
PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
+BLOWFISH_PATCH_NAME="1585-use-own-blowfish-impl.patch"
+BLOWFISH_PATCH_URI="https://dev.mikutter.hachune.net/attachments/download/813/${BLOWFISH_PATCH_NAME}";
if [ "${PV}" = "9999" ]; then
- EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git
- https://github.com/toshia/twitter_api_keys.git";
+ EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git"
inherit git-r3
-
SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb";
+ SRC_URI=" ${BLOWFISH_PATCH_URI}"
EGIT_CHECKOUT_DIR="${WORKDIR}/all"
else
SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
-
https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb";
+ ${BLOWFISH_PATCH_URI}"
KEYWORDS="~amd64 ~riscv"
fi
DESCRIPTION="Simple, powerful and moeful twitter client"
HOMEPAGE="https://mikutter.hachune.net/";
-LICENSE="MIT"
+# Apache license for the blowfish patch
+# https://dev.mikutter.hachune.net/issues/1585
+LICENSE="Apache-2.0 MIT"
SLOT="0"
IUSE="+libnotify"
+PATCHES=(
+ "${DISTDIR}/${BLOWFISH_PATCH_NAME}"
+)
+
DEPEND=""
RDEPEND="
libnotify? ( x11-libs/libnotify )
@@ -56,7 +63,6 @@ ruby_add_rdepend "=dev-ruby/addressable-2.8*
dev-ruby/ruby-gtk3
>=dev-ruby/typed-array-0.1.2
!>=dev-ruby/typed-array-0.2
- dev-ruby/twitter-text
virtual/ruby-ssl"
all_ruby_unpack() {
@@ -85,39 +91,4 @@ all_ruby_install() {
dodoc README
make_desktop_entry mikutter Mikutter \
/usr/share/mikutter/core/skin/data/icon.png
-
- insinto /usr/share/mikutter/plugin/twitter_api_keys
- newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
-}
-
-pkg_postinst() {
- echo
- elog "To use Twitter, you need to setup your Consumer Key/Consumer
Secret by running"
- elog " emerge --config =${PF}"
-}
-
-pkg_config() {
- local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
- local CK CS
-
- echo
- einfon "Please input your Consumer Key for Twitter: "
- read -r CK
-
- echo
- einfon "Please input your Consumer Secret for Twitter: "
- read -r CS
-
- if [ -z "${CK}" -o -z "${CS}" ]; then
- eerror "Consumer Key or Consumer Secret is missing."
- return
- fi
-
- sed -e "/consumer_key = /s!''!'${CK}'!" \
- -e "/consumer_secret = /s!''!'${CS}'!" \
- ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
- ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
-
- echo
- einfo "Consuker Key/Consumer secret is set."
}
diff --git a/net-misc/mikutter/mikutter-9999.ebuild
b/net-misc/mikutter/mikutter-9999.ebuild
index 0d3a72a482ca..65013295fed7 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,33 +1,40 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby31"
+USE_RUBY="ruby31 ruby32"
inherit desktop ruby-ng
PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
+BLOWFISH_PATCH_NAME="1585-use-own-blowfish-impl.patch"
+BLOWFISH_PATCH_URI="https://dev.mikutter.hachune.net/attachments/download/813/${BLOWFISH_PATCH_NAME}";
if [ "${PV}" = "9999" ]; then
- EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git
- https://github.com/toshia/twitter_api_keys.git";
+ EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git"
inherit git-r3
-
SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb";
+ SRC_URI=" ${BLOWFISH_PATCH_URI}"
EGIT_CHECKOUT_DIR="${WORKDIR}/all"
else
SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
-
https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb";
+ ${BLOWFISH_PATCH_URI}"
KEYWORDS="~amd64 ~riscv"
fi
DESCRIPTION="Simple, powerful and moeful twitter client"
HOMEPAGE="https://mikutter.hachune.net/";
-LICENSE="MIT"
+# Apache license for the blowfish patch
+# https://dev.mikutter.hachune.net/issues/1585
+LICENSE="Apache-2.0 MIT"
SLOT="0"
IUSE="+libnotify"
+PATCHES=(
+ "${DISTDIR}/${BLOWFISH_PATCH_NAME}"
+)
+
DEPEND=""
RDEPEND="
libnotify? ( x11-libs/libnotify )
@@ -56,7 +63,6 @@ ruby_add_rdepend "=dev-ruby/addressable-2.8*
dev-ruby/ruby-gtk3
>=dev-ruby/typed-array-0.1.2
!>=dev-ruby/typed-array-0.2
- dev-ruby/twitter-text
virtual/ruby-ssl"
all_ruby_unpack() {
@@ -85,39 +91,4 @@ all_ruby_install() {
dodoc README
make_desktop_entry mikutter Mikutter \
/usr/share/mikutter/core/skin/data/icon.png
-
- insinto /usr/share/mikutter/plugin/twitter_api_keys
- newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
-}
-
-pkg_postinst() {
- echo
- elog "To use Twitter, you need to setup your Consumer Key/Consumer
Secret by running"
- elog " emerge --config =${PF}"
-}
-
-pkg_config() {
- local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
- local CK CS
-
- echo
- einfon "Please input your Consumer Key for Twitter: "
- read -r CK
-
- echo
- einfon "Please input your Consumer Secret for Twitter: "
- read -r CS
-
- if [ -z "${CK}" -o -z "${CS}" ]; then
- eerror "Consumer Key or Consumer Secret is missing."
- return
- fi
-
- sed -e "/consumer_key = /s!''!'${CK}'!" \
- -e "/consumer_secret = /s!''!'${CS}'!" \
- ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
- ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
-
- echo
- einfo "Consuker Key/Consumer secret is set."
}
