From 232984022d36d76b0d1a3be79f0042a489104063 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 20 Feb 2015 14:54:09 +0000 Subject: [PATCH] Bump to EAPI=5 and fix underlinking problem, #512478 & #540802 Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- x11-misc/viewglob/ChangeLog | 12 +- x11-misc/viewglob/Manifest | 33 +++- x11-misc/viewglob/files/README.gentoo | 17 ++ .../files/viewglob-2.0.4-underlinking.patch | 163 ++++++++++++++++++ x11-misc/viewglob/metadata.xml | 5 +- x11-misc/viewglob/viewglob-2.0.4-r1.ebuild | 34 ++++ 6 files changed, 254 insertions(+), 10 deletions(-) create mode 100644 x11-misc/viewglob/files/README.gentoo create mode 100644 x11-misc/viewglob/files/viewglob-2.0.4-underlinking.patch create mode 100644 x11-misc/viewglob/viewglob-2.0.4-r1.ebuild diff --git a/x11-misc/viewglob/ChangeLog b/x11-misc/viewglob/ChangeLog index 4d74ce13ef2a..a9280acd86e0 100644 --- a/x11-misc/viewglob/ChangeLog +++ b/x11-misc/viewglob/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/viewglob -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/viewglob/ChangeLog,v 1.18 2012/05/05 04:53:54 jdhore Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/viewglob/ChangeLog,v 1.19 2015/02/20 14:54:08 jlec Exp $ + +*viewglob-2.0.4-r1 (20 Feb 2015) + + 20 Feb 2015; Justin Lecher +files/README.gentoo, + +files/viewglob-2.0.4-underlinking.patch, +viewglob-2.0.4-r1.ebuild, + metadata.xml: + Bump to EAPI=5 and fix underlinking problem, #512478 & #540802 05 May 2012; Jeff Horelick viewglob-2.0.4.ebuild: dev-util/pkgconfig -> virtual/pkgconfig @@ -61,4 +68,3 @@ +viewglob-2.0.2.ebuild: Initial import, resolves bug 63484. Thanks to Stephen Bach for the submission. - diff --git a/x11-misc/viewglob/Manifest b/x11-misc/viewglob/Manifest index 3507fa45b5f0..c56c2e17d968 100644 --- a/x11-misc/viewglob/Manifest +++ b/x11-misc/viewglob/Manifest @@ -1,4 +1,29 @@ -DIST viewglob-2.0.4.tar.gz 324752 RMD160 6808ae101fc61627a38c899056d2e57453fb119f SHA1 d3173706c4c089d4b1ac99bbe96de805093727f4 SHA256 69ef6c62de26b2fad82ddff3fcc72e15ddf7eed7047492218f7c6387c0e7c6f4 -EBUILD viewglob-2.0.4.ebuild 1470 RMD160 9158e07ee7d48c271748d908dcc9927f463fe167 SHA1 d7f43b5d0078535601504015bd149bb117ac4b71 SHA256 ea3c114d02dd3d8896949ae5bd24329e4ca50ae947522b028c71f1e5a7c39bc5 -MISC ChangeLog 2267 RMD160 8a3d31769ed7146401577c262f0a3553738fb170 SHA1 69ad2f50186c85fe05a0d193b1bd6d69fb67154c SHA256 3492c95dfe2631df01a89c2ef6284434391709a07331b86a7dc34c49e48b6d7c -MISC metadata.xml 553 RMD160 76c073cbd7c01aa5101f291bed781823b90e32ec SHA1 1c44b0d108c28229c5f5f26265b3a7717c602bc3 SHA256 e34f1eeee0a37144e91ce2d1dedb67e2c8fb1a3173c2ae510d238bbada3babef +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX README.gentoo 550 SHA256 a701eba1b4d39015f3184bd9d0f43318af2ccadbfc3113554fe0853dd646c8d5 SHA512 93a0a08cc7e3c612c78aeed2794ec66141aebe3be974605282e52d3adea48c79fae0a16bc427b2e80a83dc5914f009bb9aa7a241142d4976085c56768332fd0c WHIRLPOOL e3f8c4e561fd039f9c12862fa048bc7edcbfe986173e65570a31bafccc3e80977d2595c3fc6410c4449c5e70da3ff400b2851d16d23775d1dc3a5ebef2882b38 +AUX viewglob-2.0.4-underlinking.patch 5015 SHA256 12fa5f890a386590fe0baf8b3148e10fb666d8bcff67c97d1864e179cf8e637b SHA512 3dacc19e362bf5e69348eff097daf55c25bc4b9d3afe589ad49f28f01394da29f365708a15ce4c662918daefed95cb059b9d45d44b8269118812d5945a2997ee WHIRLPOOL f91bcfd6b4449641dbe337e8e979db667f2b5be335cd9f9f2c0e3563d4dcb46156daf2d71e57cc6d686b4e6ba2556b9fcd62895b1bbfb265bc1a87923ca9bd18 +DIST viewglob-2.0.4.tar.gz 324752 SHA256 69ef6c62de26b2fad82ddff3fcc72e15ddf7eed7047492218f7c6387c0e7c6f4 SHA512 95fb5ef6dc412804cbff6a961ec08bf8e114eefb9ea5430aa1be2f8b2bcbb7e76ab8392e31148d4275debd6f4cada81d1ebfb08a741b8a579f749efdb8f7adb4 WHIRLPOOL e22d237e736283027991a9e2c5bf61bf275b61a34ff3f6b645d46bb69fe2c524f14b07820e03cec526b2268e0ad88c81f9b82b299df253b79d64f1e0ffcb8979 +EBUILD viewglob-2.0.4-r1.ebuild 798 SHA256 d806a13fe607e3185c241f383cfefb2fb6adbb676faa9b730bc29e18072d60b0 SHA512 dc9508f5aa04ef4e5e0ff4aaf4ea89bf1d13080896b6a6c969005487e509fac96a376f5464b2d04d9f9284dcc9f5b3663e77a02fe9407cb7ff07a0052b4af612 WHIRLPOOL 549765076a0b0024956780e03428f564f63dbdbc48c7fd1f5a51b4bb8bf22823bd1932313b1bdf8b013abb582c41a03b86c193095a8bdd611b94726f508178c2 +EBUILD viewglob-2.0.4.ebuild 1470 SHA256 ea3c114d02dd3d8896949ae5bd24329e4ca50ae947522b028c71f1e5a7c39bc5 SHA512 db8536c78799efc26ea65bba7312b9733bedb107e8174332d7b4a5aabd618daf2fd2e951dba546f41be00e4a58101d07d942fef04c6b62f3fccc376e21590b31 WHIRLPOOL 69fb587d37bcf34f5db79a3cab8cac16c4226b0fac7c4522293325e30c5c145c25c0c58779a22b8ff9fa99b0016399645c50a24f745b210164bbc11b0c9b9c4a +MISC ChangeLog 2520 SHA256 cd80d656e52cca3405492dea13fa50ed5abbcb02a651d41be6dd0584f310d7bc SHA512 6d7c1afbe0fa8bb1d891f7285f60d37f1cbf337c1383f0901eebc666f1d8f7ebf611b6b27675813d15d36c3f0ca4f74096f880f8a13b230d7107d403f92128ee WHIRLPOOL f2a6c7a8e58e8fc9c01daf762dd693005b56e6939e6ca165bd79d0ec2fec3217da16d47fef010face84b74deea309f4ec0f86fbe938a43466ad8a9540c53c115 +MISC metadata.xml 554 SHA256 cc19ed31cb2d3028c527ba525407c0e2fbf99d9bbe30e477f26c9c042cc476ea SHA512 b12396bbea47b2a7a4a1a19023415b56483010a1023e6c03e94d4e143a83376a0cfe872bfb39998272d4d3f4f8544417ae9d846556e53474df9983e9a5602ac3 WHIRLPOOL 1edbe13240a40b2475892cf55eaae41d17d6f5a535c7b1230a8566edc1923592d548b97fa5682d06a9a3664bcc209c366e477106d9ce563b9f8bae9bbea287da +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCgBmBQJU50qRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirIWIP/AoDNyB2ek1Y9VyCYfGGz98j +YjAbquCxIA+l7fN1DJapPxVcyvT3vxCOAv9Wavx9fGGzP29zct80UlfVpIGYusvQ +H348I1lkFT9//JVFX/fLJA9POTr8hdpobqYDvh2XxGKxlVk8C+KYka/JQwBdEAQu +5Mc9Jujbcm20HKyd1I1JKPZvOn1T3MW7qVtsMkR6VGPYFqKq39eXH/EGheNn5cc9 +YL2YxFqfdL7NdowLL5w8XthIibNweKvtr4nvdEIUxmvPdCK3ta9zj8yNFHFLZvcG +6oLrr6vjLCujXc7YNHMU7NnGLujHgqkV9s4u9vL3qMU8cXYb4wzS6ClpygHT5FBM +oHsOL8U6Rj6S4hhlM6MrPjYEqBtC0pZeGj39M9wt0ffkUF8TystWiPFcCmrzftyJ +N329+BJmnOi6biwABVnG/WOW3gXoyLJXUEFZfut16ebZnVH+ynU0vXiHsXh+q3Ky +o+Eppkz2+U34e7pQrfAfuGL4QEV6qN8JNj+txXe4gOz7DwCWmy5f8iM7XoXuxemZ +aSqe9O1jFTlHdbKCzkK1Ruw56K1wzs2OJNBauXYFFXeZHswkt//ASgEcEGchUPu2 +9IUrvLpj5bq6vkie9bcajMoebJ9nzAUoWeLvl0C6XeeBvsky5foASN0+dBo5f1OF +iu2EumRGo/rFtkzjlTRL +=pbNU +-----END PGP SIGNATURE----- diff --git a/x11-misc/viewglob/files/README.gentoo b/x11-misc/viewglob/files/README.gentoo new file mode 100644 index 000000000000..be03a013571b --- /dev/null +++ b/x11-misc/viewglob/files/README.gentoo @@ -0,0 +1,17 @@ +/usr/bin/viewglob is a wrapper for vgd and vgseer (client and +daemon, respectively). Generally speaking, this is what you want to +execute from your shell. + +Should you prefer to start viewglob with each shell session, try +something like this: + + if [[ ! $VG_VIEWGLOB_ACTIVE && $DISPLAY ]] ; then + exec viewglob + fi + +Have a look at http://viewglob.sourceforge.net/faq.html for a +few more viewglob tricks. + +There are some known bugs in viewglob with screen. Exercise some +caution and take results with a pinch of salt if you try the two +together. diff --git a/x11-misc/viewglob/files/viewglob-2.0.4-underlinking.patch b/x11-misc/viewglob/files/viewglob-2.0.4-underlinking.patch new file mode 100644 index 000000000000..acea0bd6c359 --- /dev/null +++ b/x11-misc/viewglob/files/viewglob-2.0.4-underlinking.patch @@ -0,0 +1,163 @@ + Makefile.am | 6 +++--- + shell/Makefile.am | 12 ++++++------ + vgd/Makefile.am | 2 +- + vgdisplay/Makefile.am | 4 ++-- + vgdisplay/Makefile.in | 2 +- + vgexpand/Makefile.am | 2 +- + vgping/Makefile.am | 2 +- + vgseer/Makefile.am | 2 +- + 8 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5378bad..4b0d394 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -11,19 +11,19 @@ man_MANS = vgseer.1 viewglob.1 $(MANS_FULL) + viewglob.1: + rm -f viewglob.1.tmp + sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \ +- viewglob.1.in > viewglob.1.tmp ++ $(srcdir)/viewglob.1.in > viewglob.1.tmp + mv viewglob.1.tmp viewglob.1 + + vgseer.1: + rm -f vgseer.1.tmp + sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \ +- vgseer.1.in > vgseer.1.tmp ++ $(srcdir)/vgseer.1.in > vgseer.1.tmp + mv vgseer.1.tmp vgseer.1 + + vgd.1: + rm -f vgd.1.tmp + sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \ +- vgd.1.in > vgd.1.tmp ++ $(srcdir)/vgd.1.in > vgd.1.tmp + mv vgd.1.tmp vgd.1 + + EXTRA_DIST = COPYING2 HACKING viewglob.1.in vgseer.1.in vgd.1.in +diff --git a/shell/Makefile.am b/shell/Makefile.am +index 1d4239a..0a62bc7 100644 +--- a/shell/Makefile.am ++++ b/shell/Makefile.am +@@ -1,7 +1,7 @@ + + bin_SCRIPTS = viewglob +-pkglib_SCRIPTS = getopt.sh conf-to-args.sh +-pkglib_DATA = init-viewglob.bashrc .zshrc ++libexec_SCRIPTS = getopt.sh conf-to-args.sh ++pkgdata_DATA = init-viewglob.bashrc .zshrc + + viewglob: + rm -f viewglob.tmp +@@ -10,27 +10,27 @@ viewglob: + -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ + -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ + -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \ +- viewglob.in > viewglob.tmp ++ $(srcdir)/viewglob.in > viewglob.tmp + chmod a+x viewglob.tmp + mv viewglob.tmp viewglob + + getopt.sh: + rm -f getopt.sh.tmp + sed -e 's,@BASH_FULL_PATH\@,$(BASH_FULL_PATH),g' \ +- getopt.sh.in > getopt.sh.tmp ++ $(srcdir)/getopt.sh.in > getopt.sh.tmp + chmod a+x getopt.sh.tmp + mv getopt.sh.tmp getopt.sh + + .zshrc: + rm -f init-viewglob.zshrc.tmp + sed -e 's,@pkglibdir\@,$(pkglibdir),g' \ +- init-viewglob.zshrc.in > init-viewglob.zshrc.tmp ++ $(srcdir)/init-viewglob.zshrc.in > init-viewglob.zshrc.tmp + mv init-viewglob.zshrc.tmp .zshrc + + init-viewglob.bashrc: + rm -f init-viewglob.bashrc.tmp + sed -e 's,@pkglibdir\@,$(pkglibdir),g' \ +- init-viewglob.bashrc.in > init-viewglob.bashrc.tmp ++ $(srcdir)/init-viewglob.bashrc.in > init-viewglob.bashrc.tmp + mv init-viewglob.bashrc.tmp init-viewglob.bashrc + + +diff --git a/vgd/Makefile.am b/vgd/Makefile.am +index 634b7de..1982981 100644 +--- a/vgd/Makefile.am ++++ b/vgd/Makefile.am +@@ -25,7 +25,7 @@ BUILT_SOURCES = vgd-usage.h + + vgd-usage.h: vgd-usage.txt + rm -f vgd-usage.tmp +- sed vgd-usage.tmp \ ++ sed < $(srcdir)/vgd-usage.txt >vgd-usage.tmp \ + -e 's/\\/\\\\/g' \ + -e 's/"/\\"/g' \ + -e 's/.*/\"&\\n\"/' +diff --git a/vgdisplay/Makefile.am b/vgdisplay/Makefile.am +index 4aa941b..5d2e1df 100644 +--- a/vgdisplay/Makefile.am ++++ b/vgdisplay/Makefile.am +@@ -4,9 +4,9 @@ AM_CPPFLAGS = -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR) \ + LDADD = \ + @GLIB_LIBS@ \ + @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ +- @GTK_LIBS@ ++ @GTK_LIBS@ -lm + +-pkglib_PROGRAMS = vgclassic vgmini ++libexec_PROGRAMS = vgclassic vgmini + + vgclassic_SOURCES = \ + vgclassic.c \ +diff --git a/vgdisplay/Makefile.in b/vgdisplay/Makefile.in +index 218587b..cd7d86d 100644 +--- a/vgdisplay/Makefile.in ++++ b/vgdisplay/Makefile.in +@@ -55,7 +55,7 @@ am_vgclassic_OBJECTS = vgclassic.$(OBJEXT) exhibit.$(OBJEXT) \ + hardened-io.$(OBJEXT) x11-stuff.$(OBJEXT) syslogging.$(OBJEXT) \ + fgetopt.$(OBJEXT) + vgclassic_OBJECTS = $(am_vgclassic_OBJECTS) +-vgclassic_LDADD = $(LDADD) ++vgclassic_LDADD = $(LDADD) -lm + vgclassic_DEPENDENCIES = + am_vgmini_OBJECTS = vgmini.$(OBJEXT) wrap_box.$(OBJEXT) \ + file_box.$(OBJEXT) lscolors.$(OBJEXT) dircont.$(OBJEXT) \ +diff --git a/vgexpand/Makefile.am b/vgexpand/Makefile.am +index e6817cc..6357fc8 100644 +--- a/vgexpand/Makefile.am ++++ b/vgexpand/Makefile.am +@@ -2,7 +2,7 @@ COMMON_DIR = $(top_srcdir)/common + AM_CPPFLAGS = @GLIB_CFLAGS@ -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR) + LDADD = @GLIB_LIBS@ + +-pkglib_PROGRAMS = vgexpand ++libexec_PROGRAMS = vgexpand + + vgexpand_SOURCES = vgexpand.c + +diff --git a/vgping/Makefile.am b/vgping/Makefile.am +index 02a1db3..7b09845 100644 +--- a/vgping/Makefile.am ++++ b/vgping/Makefile.am +@@ -1,6 +1,6 @@ + COMMON_DIR = $(top_srcdir)/common + +-pkglib_PROGRAMS = vgping ++libexec_PROGRAMS = vgping + + vgping_CPPFLAGS = @GLIB_CFLAGS@ -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR) + vgping_LDADD = @GLIB_LIBS@ @LIBS@ +diff --git a/vgseer/Makefile.am b/vgseer/Makefile.am +index ff0431e..05480b8 100644 +--- a/vgseer/Makefile.am ++++ b/vgseer/Makefile.am +@@ -29,7 +29,7 @@ BUILT_SOURCES = vgseer-usage.h + + vgseer-usage.h: vgseer-usage.txt + rm -f vgseer-usage.tmp +- sed vgseer-usage.tmp \ ++ sed < $(srcdir)/vgseer-usage.txt >vgseer-usage.tmp \ + -e 's/\\/\\\\/g' \ + -e 's/"/\\"/g' \ + -e 's/.*/\"&\\n\"/' diff --git a/x11-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml index 9e0d8adf888b..c79f5ca0f480 100644 --- a/x11-misc/viewglob/metadata.xml +++ b/x11-misc/viewglob/metadata.xml @@ -1,8 +1,8 @@ - shell-tools - + shell-tools + Viewglob is a package that graphically displays the results of a shell glob, helping beginners of shell usage become acclimitised to filename generation. In addition, it acts as a basic replacement for ls, by @@ -10,4 +10,3 @@ and helper files and documentation are provided. - diff --git a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild new file mode 100644 index 000000000000..3c9e6336e7f8 --- /dev/null +++ b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild,v 1.1 2015/02/20 14:54:08 jlec Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes + +inherit autotools-utils readme.gentoo + +DESCRIPTION="Graphical display of directories and globs referenced at the shell prompt" +HOMEPAGE="http://viewglob.sourceforge.net/" +SRC_URI="mirror://sourceforge/viewglob/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND=" + dev-libs/glib + x11-libs/gtk+:2 + || ( app-shells/bash app-shells/zsh )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-underlinking.patch +) + +src_install() { + autotools-utils_src_install + readme.gentoo_src_install +} -- 2.26.2