diff options
Diffstat (limited to 'app-shells/hstr')
| -rw-r--r-- | app-shells/hstr/Manifest | 8 | ||||
| -rw-r--r-- | app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch | 14 | ||||
| -rw-r--r-- | app-shells/hstr/hstr-2.0.ebuild | 12 | ||||
| -rw-r--r-- | app-shells/hstr/hstr-2.1.ebuild | 33 | ||||
| -rw-r--r-- | app-shells/hstr/hstr-2.2.ebuild | 17 |
5 files changed, 29 insertions, 55 deletions
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest index 4cd4ad4f0d79..988403184451 100644 --- a/app-shells/hstr/Manifest +++ b/app-shells/hstr/Manifest @@ -1,8 +1,6 @@ -AUX hstr-2.0-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99 +AUX hstr-2.0-fix-ncurses-configure.patch 2493 BLAKE2B 32e198aea7efd9416526feaf85e06029f05ec26aa982ceaacbb7f505ff8a4e7995a8222a3f033ca270b9f09ecf0465b56f9c3ec5b15dd202fa26e0f7e011062d SHA512 3c43179ce88a35599d44c60af5f4287383c0612eace067f2097e26bb2ab6d05573e8486ae83b9d1f6d222a65fb4466c64c4d0a34b15cce8bef4b75af0ec0b7ab DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7 -DIST hstr-2.1.tar.gz 1244067 BLAKE2B aa37f26a5ba8ee465a03212cc80e55b9581e59cbb535f17fda8e59bed062f0b0065d456d8566927c089595b92270b83235f0bf73f26ac88704bd933c1926cd5b SHA512 ea217ac2b6dcb7e283f83d15524b47f88c5c8cfb82e5728537750a2ec8526f03304503a5bb67970d893e10057aba087aa86a67548aa361c892b6ee3e81903122 DIST hstr-2.2.tar.gz 1246786 BLAKE2B f14091fea391dada79798c957b0b1094aff73b7ab4f8d9fd53c1070924556a7ff59f6f5a2e49b36dcd46ca6f93c5f8cd0fcfef07d5f7458d4bbe021546ccdc7a SHA512 c133edaa63a2be76356c08e52303d4133b11803e3ac6f915566a8d1b4651991b14d43974618061b2fc98c49e21b650ff6b9ac8168512e76566e327f90a550e4a -EBUILD hstr-2.0.ebuild 642 BLAKE2B 83c4bdcd14bea1f873828f3856183a529144bca3876b960895b86c2c1f2bb82d66d48d9d68a541aa719c9e07f2a072ce7d77783bc32dbc2a5db89de945503140 SHA512 30d50d5190f4476969aa97af6e1af4111f91cbe457fca2b51b34c9c4ac42e24d9e68fb305cd1898c3088faa23ad581b27c03084fc306992b8af4b657304d6a07 -EBUILD hstr-2.1.ebuild 649 BLAKE2B e71c9b05847367cbd4b9f2fdb2f00343a7d27b49e7e891958760876bae7daff742b357fcd384df029e3fa4d3b5e10c3a5d491ec5910b67aaaf813709ac3db890 SHA512 56b66c6985ffdce179d99e2456c95a87ff26eaebcbda4dec771786ddf5120d13381dac342c62d97f8ccb39fded57431041061bc2562150c666d570019699fa61 -EBUILD hstr-2.2.ebuild 649 BLAKE2B 268080b28c8b2dbdba9f584de178436943fab23b4f948c7b6238e65a12c958e9e5ebf5bbd16c936b86c84e8dabcbd2964767ea6e8b591ba6a380805a0461263c SHA512 6ea14affa91828e04a70a400ae951e8da07ab1a3a119fcc9a05ca2c50eda7734052ea1fd4abd2f0cd31a9be859f27cb43bb66b9cd4e22cd9b95714e855da8524 +EBUILD hstr-2.0.ebuild 686 BLAKE2B af341513a351df74714b6f3b49f47b2639f9bde238f59b4920ecd864d21712bb020f88a6068252a80f21c99cde5ce1e25b75c541a59e1daab0be6285178c7bc1 SHA512 d99bc7f83dd0229e5946cd284ceabb6efc20100692ca0664d8b728f1d2cebda5b23b432621f1d73a3da64ce2832be2c61fa2fdb2521802d4b7a3f46585160f4b +EBUILD hstr-2.2.ebuild 703 BLAKE2B 1070254d71d89cb1d756b10821dc68be2f7ee5b1fdc2d7a4ca5da57f1f1359077b429460a04e1534877e2385e362c54cf3b67c6137f0b4006634f23822c0fdf8 SHA512 7d0d1e289ce09ebda054711598f38a04123a1dc50693272d7a617383e18033a5fea9dc74f657f15fdcbb1fb00a2a05c2850a2c7c618eec75ebc526d12a7b586d MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e diff --git a/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch index 215fd5cedfc9..9b5c089b67d8 100644 --- a/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch +++ b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch @@ -1,5 +1,3 @@ -diff --git a/configure.ac b/configure.ac -index 1676ec8..73c8be5 100644 --- a/configure.ac +++ b/configure.ac @@ -47,39 +47,33 @@ then @@ -44,14 +42,14 @@ index 1676ec8..73c8be5 100644 +if pkg-config --exists ncursesw +then + AC_MSG_NOTICE([Module ncursesw found]) -+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` -+ NCURSESW_LIBS=`pkg-config --libs ncursesw` ++ NCURSESW_CFLAGS=`${PKG_CONFIG} --cflags ncursesw` ++ NCURSESW_LIBS=`${PKG_CONFIG} --libs ncursesw` +else -+ if pkg-config --exists ncurses ++ if ${PKG_CONFIG} --exists ncurses + then + AC_MSG_NOTICE([Module ncurses found]) -+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` -+ NCURSESW_LIBS=`pkg-config --libs ncurses` ++ NCURSESW_CFLAGS=`${PKG_CONFIG} --cflags ncursesw` ++ NCURSESW_LIBS=`${PKG_CONFIG} --libs ncurses` + else + AS_CASE([$host_os], + [darwin*], @@ -69,8 +67,6 @@ index 1676ec8..73c8be5 100644 # Checks for libraries. -diff --git a/src/Makefile.am b/src/Makefile.am -index 7640d21..17a82b7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,4 +37,4 @@ hstr_SOURCES = \ diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild index b2332147a9b4..3c117b21f991 100644 --- a/app-shells/hstr/hstr-2.0.ebuild +++ b/app-shells/hstr/hstr-2.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools +inherit autotools toolchain-funcs DESCRIPTION="Shell history suggest box" HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com" @@ -22,12 +22,18 @@ DEPEND=" DOCS=( CONFIGURATION.md README.md ) -PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fix-ncurses-configure.patch +) src_prepare() { default + sed \ -e 's:-O2::g' \ -i src/Makefile.am || die + + tc-export PKG_CONFIG + eautoreconf } diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild deleted file mode 100644 index 95a0c74991ac..000000000000 --- a/app-shells/hstr/hstr-2.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Shell history suggest box" -HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com" -SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - sys-libs/ncurses:0=[unicode]" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" - -DOCS=( CONFIGURATION.md README.md ) - -PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch ) - -src_prepare() { - default - sed \ - -e 's:-O2::g' \ - -i src/Makefile.am || die - eautoreconf -} diff --git a/app-shells/hstr/hstr-2.2.ebuild b/app-shells/hstr/hstr-2.2.ebuild index 08f0c98ba78d..0033ce507cfd 100644 --- a/app-shells/hstr/hstr-2.2.ebuild +++ b/app-shells/hstr/hstr-2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools toolchain-funcs DESCRIPTION="Shell history suggest box" HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com" @@ -17,17 +17,24 @@ RDEPEND=" sys-libs/ncurses:0=[unicode]" DEPEND=" - ${RDEPEND} - virtual/pkgconfig" + ${RDEPEND}" + +BDEPEND="virtual/pkgconfig" DOCS=( CONFIGURATION.md README.md ) -PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.0-fix-ncurses-configure.patch +) src_prepare() { default + sed \ -e 's:-O2::g' \ -i src/Makefile.am || die + + tc-export PKG_CONFIG + eautoreconf } |