From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- x11-misc/wbar/Manifest | 1 + x11-misc/wbar/files/wbar-2.3.3-cfg.patch | 15 ++++ x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch | 89 ++++++++++++++++++++++ x11-misc/wbar/files/wbar-2.3.3-nowerror.patch | 14 ++++ x11-misc/wbar/files/wbar-2.3.3-test.patch | 11 +++ x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch | 11 +++ x11-misc/wbar/files/wbar-2.3.4-completion.patch | 19 +++++ x11-misc/wbar/metadata.xml | 11 +++ x11-misc/wbar/wbar-2.3.4-r1.ebuild | 54 +++++++++++++ x11-misc/wbar/wbar-2.3.4-r2.ebuild | 56 ++++++++++++++ 10 files changed, 281 insertions(+) create mode 100644 x11-misc/wbar/Manifest create mode 100644 x11-misc/wbar/files/wbar-2.3.3-cfg.patch create mode 100644 x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch create mode 100644 x11-misc/wbar/files/wbar-2.3.3-nowerror.patch create mode 100644 x11-misc/wbar/files/wbar-2.3.3-test.patch create mode 100644 x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch create mode 100644 x11-misc/wbar/files/wbar-2.3.4-completion.patch create mode 100644 x11-misc/wbar/metadata.xml create mode 100644 x11-misc/wbar/wbar-2.3.4-r1.ebuild create mode 100644 x11-misc/wbar/wbar-2.3.4-r2.ebuild (limited to 'x11-misc/wbar') diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest new file mode 100644 index 000000000000..0b1ab5586c9f --- /dev/null +++ b/x11-misc/wbar/Manifest @@ -0,0 +1 @@ +DIST wbar-2.3.4.tgz 189999 SHA256 46a69849e4436529aefb5cfb2c94b520d05a53c237e7773b90207f67f97a93e3 SHA512 07f3484bd071761d57ef1172c56b30980eef9ce2ee65d1fc21ea20c631a1da1d88c1b8a9e1a1fca0e5f18e7bf1c5697c349a543d72966ce71ff53d7e921147b3 WHIRLPOOL 3d5ff6e1ea5f9079c5e7ab2e9e59729795514415241f180c9438480d94c192180f725f6d541b117ed33728694f632fc11beb69bcfdb3dcbc03d4c211e2b28d31 diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch new file mode 100644 index 000000000000..5ffd82869983 --- /dev/null +++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch @@ -0,0 +1,15 @@ +From: Julian Ospald +Date: Fri Sep 21 21:45:22 UTC 2012 +Subject: remove wbar-config for -gtk + +--- a/etc/wbar.cfg.in ++++ b/etc/wbar.cfg.in +@@ -2,8 +2,3 @@ + c: @PACKAGE_NAME@ @DEFAULT_ARGV@ + t: none + +-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png +-c: wbar-config +-t: Config +- +- diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch new file mode 100644 index 000000000000..79a5de15629d --- /dev/null +++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch @@ -0,0 +1,89 @@ +From: Julian Ospald +Date: Fri Sep 21 17:08:32 2012 +0200 + + fix desktop file destination and QA issues + +diff --git a/configure.ac b/configure.ac +index 00ad0b6..48fe73d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ]) + + AC_CONFIG_FILES([Makefile \ + share/Makefile \ ++share/wbar.desktop.in \ + etc/Makefile \ + etc/wbar.cfg \ + etc/wbar.desktop.in \ +diff --git a/etc/Makefile.am b/etc/Makefile.am +index ec41c76..d78525e 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop) + defaultdir = @DEFAULT_CONFIGDIR@ + default_DATA = $(wbarcfg:.cfg.in=.cfg) + +-autostartdir = @DEFAULT_CONFIGDIR@ ++autostartdir = $(sysconfdir)/xdg/autostart + autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop) + + bashcompletiondir = /etc/bash_completion.d +diff --git a/po/POTFILES.in b/po/POTFILES.in +index ddf920c..16ee6dd 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,3 +1,4 @@ ++share/wbar.desktop.in + share/wbar.glade + src/config/Functions.cc + src/config/Functions.h +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 327f139..27a8f48 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,2 +1,3 @@ + etc/wbar.desktop.in.in ++share/wbar.desktop.in.in + +diff --git a/share/Makefile.am b/share/Makefile.am +index 87c736b..66027d4 100644 +--- a/share/Makefile.am ++++ b/share/Makefile.am +@@ -1,8 +1,17 @@ +-CLEANFILES = *~ ++CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop) + + gladedir = @GLADE_PACKAGE_DIR@ + glade_DATA = @PACKAGE@.glade + ++desktopfilesdir = $(prefix)/share/applications ++desktopfiles_DATA = $(wbardesktop:.desktop.in.in=.desktop) ++ ++@INTLTOOL_DESKTOP_RULE@ ++ ++wbardesktop = wbar.desktop.in.in ++ + EXTRA_DIST = \ +-$(glade_DATA) ++$(glade_DATA) \ ++$(wbardesktop) \ ++$(wbardesktop:.desktop.in.in=.desktop.in) + +diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in +new file mode 100644 +index 0000000..48fc33c +--- /dev/null ++++ b/share/wbar.desktop.in.in +@@ -0,0 +1,12 @@ ++[Desktop Entry] ++_Name=Warlock Bar ++Type=Application ++Exec=@BINDIR@/@PACKAGE_NAME@ ++Terminal=false ++Icon=@PIXMAPDIR@/@PACKAGE_NAME@.png ++_Comment=A light and fast launch bar. ++Categories=Utility; ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=@PACKAGE_NAME@ ++X-GNOME-Bugzilla-Component=general ++X-Ubuntu-Gettext-Domain=@PACKAGE_NAME@ diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch new file mode 100644 index 000000000000..2cf163bc4642 --- /dev/null +++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch @@ -0,0 +1,14 @@ +From: Julian Ospald +Date: Sun Aug 26 17:18:37 UTC 2012 +Subject: remove Werror + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -8,7 +8,6 @@ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -Wall \ + -Wunused \ +- -Werror \ + -I$(top_srcdir)/src/utils + + if WBAR_CONFIG diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch new file mode 100644 index 000000000000..4468791a4202 --- /dev/null +++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch @@ -0,0 +1,11 @@ +From: Julian Ospald +Date: Fri Sep 21 21:50:34 UTC 2012 +Subject: fix test phase + +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,3 +1,4 @@ ++etc/wbar.desktop.in + share/wbar.desktop.in + share/wbar.glade + src/config/Functions.cc diff --git a/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch new file mode 100644 index 000000000000..d8f59518ca16 --- /dev/null +++ b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + AC_INIT([wbar], [2.3.4]) + AM_INIT_AUTOMAKE([ filename-length-max=256 tar-ustar ]) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + + AC_PROG_CXX diff --git a/x11-misc/wbar/files/wbar-2.3.4-completion.patch b/x11-misc/wbar/files/wbar-2.3.4-completion.patch new file mode 100644 index 000000000000..218d33442a9e --- /dev/null +++ b/x11-misc/wbar/files/wbar-2.3.4-completion.patch @@ -0,0 +1,19 @@ +--- a/etc/wbar ++++ b/etc/wbar +@@ -1,7 +1,6 @@ + # bash completion for wbar + # Yadickson Soto yadickson@gmail.com + +-have wbar && + _wbar() + { + local cur prev split=false +@@ -106,7 +105,7 @@ + -- "$cur") ) + + fi +-} && ++} + complete -F _wbar wbar + + # Local variables: diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml new file mode 100644 index 000000000000..a5d082ae569c --- /dev/null +++ b/x11-misc/wbar/metadata.xml @@ -0,0 +1,11 @@ + + + + desktop-misc + + Enables the gtk-based wbar-config GUI + + + wbar + + diff --git a/x11-misc/wbar/wbar-2.3.4-r1.ebuild b/x11-misc/wbar/wbar-2.3.4-r1.ebuild new file mode 100644 index 000000000000..1970cd096d8b --- /dev/null +++ b/x11-misc/wbar/wbar-2.3.4-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools bash-completion-r1 eutils + +DESCRIPTION="A fast, lightweight quick launch bar" +HOMEPAGE="http://code.google.com/p/wbar/" +SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="gtk" + +RDEPEND="media-libs/imlib2[X] + x11-libs/libX11 + gtk? ( gnome-base/libglade + media-libs/freetype:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch + epatch \ + "${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \ + "${FILESDIR}"/${PN}-2.3.3-nowerror.patch \ + "${FILESDIR}"/${PN}-2.3.3-test.patch \ + "${FILESDIR}"/${P}-automake-1.13.patch + + sed -i \ + -e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \ + etc/Makefile.am || die #482358 + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable gtk wbar-config) +} + +pkg_postinst() { + einfo + elog "media-libs/imlib2 needs to be compiled with the appropriate useflags" + elog "depending on your choice of image files (such as png, jpeg...)" + einfo +} diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild b/x11-misc/wbar/wbar-2.3.4-r2.ebuild new file mode 100644 index 000000000000..2d357ca05432 --- /dev/null +++ b/x11-misc/wbar/wbar-2.3.4-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools bash-completion-r1 eutils + +DESCRIPTION="A fast, lightweight quick launch bar" +HOMEPAGE="http://code.google.com/p/wbar/" +SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" + +RDEPEND="media-libs/imlib2[X] + x11-libs/libX11 + gtk? ( gnome-base/libglade + media-libs/freetype:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch + + epatch \ + "${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \ + "${FILESDIR}"/${PN}-2.3.3-nowerror.patch \ + "${FILESDIR}"/${PN}-2.3.3-test.patch \ + "${FILESDIR}"/${P}-automake-1.13.patch \ + "${FILESDIR}"/${P}-completion.patch + + sed -i \ + -e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \ + etc/Makefile.am || die #482358 + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable gtk wbar-config) +} + +pkg_postinst() { + einfo + elog "media-libs/imlib2 needs to be compiled with the appropriate useflags" + elog "depending on your choice of image files (such as png, jpeg...)" + einfo +} -- cgit v1.2.3-65-gdbad