diff options
author | Julian Ospald <hasufell@gentoo.org> | 2013-07-08 17:39:44 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2013-07-08 17:39:44 +0000 |
commit | b7707b3c46be874cee346b8dd37d958f32684b3c (patch) | |
tree | f298076cefaf8530e20ec95e166b9df06f151b67 /net-irc/hexchat | |
parent | Version bump, drop old (diff) | |
download | gentoo-2-b7707b3c46be874cee346b8dd37d958f32684b3c.tar.gz gentoo-2-b7707b3c46be874cee346b8dd37d958f32684b3c.tar.bz2 gentoo-2-b7707b3c46be874cee346b8dd37d958f32684b3c.zip |
remove old
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'net-irc/hexchat')
-rw-r--r-- | net-irc/hexchat/ChangeLog | 8 | ||||
-rw-r--r-- | net-irc/hexchat/files/hexchat-2.9.3-cflags.patch | 17 | ||||
-rw-r--r-- | net-irc/hexchat/files/hexchat-2.9.3-nogtk.patch | 11 | ||||
-rw-r--r-- | net-irc/hexchat/files/hexchat-2.9.4-build.patch | 148 | ||||
-rw-r--r-- | net-irc/hexchat/hexchat-2.9.3.ebuild | 101 | ||||
-rw-r--r-- | net-irc/hexchat/hexchat-2.9.4-r2.ebuild | 139 | ||||
-rw-r--r-- | net-irc/hexchat/hexchat-2.9.4.ebuild | 108 |
7 files changed, 7 insertions, 525 deletions
diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog index 5aefb88434ae..a526e53561b0 100644 --- a/net-irc/hexchat/ChangeLog +++ b/net-irc/hexchat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/hexchat # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.64 2013/07/07 15:14:46 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.65 2013/07/08 17:39:44 hasufell Exp $ + + 08 Jul 2013; Julian Ospald <hasufell@gentoo.org> -hexchat-2.9.3.ebuild, + -files/hexchat-2.9.3-cflags.patch, -files/hexchat-2.9.3-nogtk.patch, + -hexchat-2.9.4.ebuild, -hexchat-2.9.4-r2.ebuild, + -files/hexchat-2.9.4-build.patch: + remove old 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> hexchat-2.9.5-r1.ebuild: Stable for ia64, wrt bug #474434 diff --git a/net-irc/hexchat/files/hexchat-2.9.3-cflags.patch b/net-irc/hexchat/files/hexchat-2.9.3-cflags.patch deleted file mode 100644 index 47c878448599..000000000000 --- a/net-irc/hexchat/files/hexchat-2.9.3-cflags.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -771,14 +771,6 @@ - if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then - CFLAGS="$CFLAGS -Wall" - fi -- if test "$system" = "Linux" -o "$system" = "FreeBSD"; then -- if test -z "`echo "$CFLAGS" | grep "\-pipe" 2> /dev/null`" ; then -- CFLAGS="$CFLAGS -pipe" -- fi -- fi -- if test -z "`echo "$CFLAGS" | grep "\-g " 2> /dev/null`" ; then -- CFLAGS="$CFLAGS -g" -- fi - fi - - dnl does this compiler support -Wno-pointer-sign ? diff --git a/net-irc/hexchat/files/hexchat-2.9.3-nogtk.patch b/net-irc/hexchat/files/hexchat-2.9.3-nogtk.patch deleted file mode 100644 index c57398e58564..000000000000 --- a/net-irc/hexchat/files/hexchat-2.9.3-nogtk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fe-text/fe-text.c.orig 2012-11-14 20:21:44.371749885 +0100 -+++ src/fe-text/fe-text.c 2012-11-14 20:22:05.914751110 +0100 -@@ -788,7 +788,7 @@ - { - } - void --fe_lastlog (session * sess, session * lastlog_sess, char *sstr, gboolean regexp) -+fe_lastlog (session *sess, session *lastlog_sess, char *sstr, gtk_xtext_search_flags flags) - { - } - void diff --git a/net-irc/hexchat/files/hexchat-2.9.4-build.patch b/net-irc/hexchat/files/hexchat-2.9.4-build.patch deleted file mode 100644 index b4caaf454e27..000000000000 --- a/net-irc/hexchat/files/hexchat-2.9.4-build.patch +++ /dev/null @@ -1,148 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Sun Mar 31 14:48:15 UTC 2013 -Subject: build system - -* not having gtk installed will lead to undefined macro -* intl subdir not needed, remove references -* po/Makefile.in will be generated by gettextize -* use modern icon destination -* don't install icons when gtk is disabled -* disable gconf when gtk is disabled -* install plugin header -* allow to pass specific python version - ---- hexchat-2.9.4/configure.ac -+++ hexchat-2.9.4/configure.ac -@@ -115,8 +115,8 @@ - xlib=$enableval, xlib=yes) - - AC_ARG_ENABLE(python, -- [AS_HELP_STRING([--disable-python],[don't build the python plugin])], -- python=$enableval, python=yes) -+ [AS_HELP_STRING([--enable-python=pythonversion],[build the python plugin (default on, python2)])], -+ python=$enableval, python=python2) - - AC_ARG_ENABLE(perl, - [AS_HELP_STRING([--disable-perl],[don't build the perl plugin])], -@@ -200,13 +200,16 @@ - dnl ** GTK ************************************************************** - dnl ********************************************************************* - --AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no) -- --if test "$havegtk" = no; then -- gtkfe=no -- echo -- echo Cannot find GTK\! Not building GTK FrontEnd. -- echo -+# we might get undefined macro without this test -+if test "$gtkfe" = yes ; then -+ AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no) -+ -+ if test "$havegtk" = no; then -+ gtkfe=no -+ echo -+ echo Cannot find GTK\! Not building GTK FrontEnd. -+ echo -+ fi - fi - - if test "$gtkfe" != yes; then -@@ -222,7 +225,6 @@ - GUI_LIBS="$GUI_LIBS $GTK_LIBS" - GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS" - --gnome=no - #if test "$gnome" = yes; then - # AC_PATH_PROG(pkgconfigpath, pkg-config) - # AC_MSG_CHECKING(Gnome2 compile flags) -@@ -240,7 +242,11 @@ - #fi - - # GConf --AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -+if test "$gnome" != no ; then -+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -+else -+ GCONFTOOL=no -+fi - - dnl ********************************************************************* - dnl ** XFT ************************************************************** -@@ -329,9 +335,13 @@ - dnl ** PYTHON *********************************************************** - dnl ********************************************************************* - --if test "$python" = yes; then -- AC_PATH_PROG(pythonpath, python2) -- if test "_$pythonpath" = _ ; then -+if test "x$python" != xno ; then -+ if test "$python" = yes ; then -+ # default -+ python="python2" -+ fi -+ AC_PATH_PROG(pythonpath, $python) -+ if test "_$pythonpath" = _ ; then - AC_PATH_PROG(pythonpath, python) - fi - if test "_$pythonpath" = _ ; then -@@ -358,7 +368,7 @@ - AC_MSG_RESULT([Can't find Python.h]) - fi - else -- echo "Python too old. Only 2.2 or above is supported." -+ echo "Python is too old or too new. Only 2.2-2.7 are supported." - python=no - fi - fi -@@ -691,7 +701,7 @@ - AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes") - AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes") - AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") --AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") -+AM_CONDITIONAL(DO_PYTHON, test "x$python" != "xno") - AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes") - AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes") - AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes") -@@ -964,8 +974,6 @@ - plugins/doat/Makefile - plugins/fishlim/Makefile - plugins/sysinfo/Makefile --intl/Makefile --po/Makefile.in - man/Makefile - ]) - dnl plugins/sasl/Makefile ---- hexchat-2.9.4/Makefile.am -+++ hexchat-2.9.4/Makefile.am -@@ -1,13 +1,15 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = po intl src plugins man -+SUBDIRS = po src plugins man - - EXTRA_DIST = autogen.sh - -+if DO_GTK - icon_DATA = src/pixmaps/hexchat.png --icondir = $(datadir)/pixmaps -+icondir = $(datadir)/icons/hicolor/48x48/apps - - util_DATA = share/misc/hexchat.desktop - utildir = $(datadir)/applications -+endif - - ACLOCAL_AMFLAGS = -I m4 ---- hexchat-2.9.4/src/common/Makefile.am -+++ hexchat-2.9.4/src/common/Makefile.am -@@ -52,6 +52,10 @@ - endif - SUBDIRS = $(dbusdir) . - -+if DO_PLUGIN -+include_HEADERS = hexchat-plugin.h -+endif -+ - libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \ - history.c ignore.c inbound.c modes.c msproxy.c network.c notify.c \ - outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \ diff --git a/net-irc/hexchat/hexchat-2.9.3.ebuild b/net-irc/hexchat/hexchat-2.9.3.ebuild deleted file mode 100644 index c89e21ad7876..000000000000 --- a/net-irc/hexchat/hexchat-2.9.3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.3.ebuild,v 1.11 2013/03/09 11:18:42 pinkbyte Exp $ - -EAPI=4 - -inherit eutils gnome2 multilib versionator - -DESCRIPTION="Graphical IRC client based on XChat" -SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz" -HOMEPAGE="http://www.hexchat.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux" -IUSE="dbus fastscroll +gtk ipv6 libnotify nls ntlm perl python spell ssl tcl" - -RDEPEND="dev-libs/glib:2 - x11-libs/pango - dbus? ( >=dev-libs/dbus-glib-0.98 ) - gtk? ( x11-libs/gtk+:2 ) - libnotify? ( x11-libs/libnotify ) - ntlm? ( net-libs/libntlm ) - perl? ( >=dev-lang/perl-5.8.0 ) - python? ( =dev-lang/python-2* ) - tcl? ( dev-lang/tcl ) - spell? ( app-text/gtkspell:2 ) - ssl? ( >=dev-libs/openssl-0.9.8u )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -DOCS="ChangeLog README" - -pkg_setup() { - # Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org> - if [[ ${ARCH} = sparc ]] ; then - replace-flags "-O[3-9]" "-O2" - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.9.1-input-box.patch \ - "${FILESDIR}"/${PN}-2.9.3-cflags.patch \ - "${FILESDIR}"/${PN}-2.9.3-nogtk.patch - - # use $libdir/hexchat/plugins as the plugin directory - if [[ $(get_libdir) != "lib" ]] ; then - sed -e 's:${prefix}/lib/hexchat:${libdir}/hexchat:' \ - -i configure.ac || die 'sed failed' - fi - - # QA: remove deprecated line from desktop file - sed -e '/Encoding=UTF-8/d' -i ${PN}.desktop || die 'sed failed' - - # Fix to compile with USE=-gtk when there is no gtk installed - if ! use gtk ; then - sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die 'sed failed' - fi - - ./autogen.sh || die -} - -src_configure() { - econf --enable-shm \ - $(use_enable dbus) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable ntlm) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable spell spell gtkspell) \ - $(use_enable ssl openssl) \ - $(use_enable tcl) \ - $(use_enable gtk gtkfe) \ - $(use_enable !gtk textfe) \ - $(use_enable fastscroll xft) -} - -src_install() { - default - prune_libtool_files --all - - # install plugin development header - insinto /usr/include/hexchat - doins src/common/xchat-plugin.h - - # remove useless desktop entry when gtk USE flag is unset - if ! use gtk ; then - rm "${ED}"/usr/share/applications -rf - fi -} - -pkg_postinst() { - if use !gtk ; then - elog "You have disabled the gtk USE flag. This means you don't have" - elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"." - fi - gnome2_icon_cache_update -} diff --git a/net-irc/hexchat/hexchat-2.9.4-r2.ebuild b/net-irc/hexchat/hexchat-2.9.4-r2.ebuild deleted file mode 100644 index e91d7878e498..000000000000 --- a/net-irc/hexchat/hexchat-2.9.4-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4-r2.ebuild,v 1.3 2013/05/29 13:33:54 hasufell Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_5 python2_6 python2_7 ) -inherit autotools eutils gnome2-utils mono multilib python-single-r1 - -DESCRIPTION="Graphical IRC client based on XChat" -SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz" -HOMEPAGE="http://www.hexchat.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" -IUSE="dbus fastscroll +gtk ipv6 libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager" -REQUIRED_USE="plugin-checksum? ( plugins ) - plugin-doat? ( plugins ) - plugin-fishlim? ( plugins ) - plugin-sysinfo? ( plugins ) - python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="dev-libs/glib:2 - dbus? ( >=dev-libs/dbus-glib-0.98 ) - fastscroll? ( x11-libs/libXft ) - gtk? ( x11-libs/gtk+:2 ) - libproxy? ( net-libs/libproxy ) - libnotify? ( x11-libs/libnotify ) - nls? ( virtual/libintl ) - ntlm? ( net-libs/libntlm ) - perl? ( >=dev-lang/perl-5.8.0 ) - plugin-sysinfo? ( sys-apps/pciutils ) - python? ( ${PYTHON_DEPS} ) - spell? ( dev-libs/libxml2 ) - ssl? ( >=dev-libs/openssl-0.9.8u ) - theme-manager? ( dev-lang/mono )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - theme-manager? ( dev-util/monodevelop )" - -DOCS="share/doc/changelog.md share/doc/readme.md" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.9.1-input-box.patch \ - "${FILESDIR}"/${PN}-2.9.3-cflags.patch \ - "${FILESDIR}"/${PN}-2.9.4-build.patch - - cp $(type -p gettextize) "${T}"/ || die - sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die - einfo "Running gettextize -f --no-changelog..." - "${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed" - eautoreconf -} - -src_configure() { - # tcl is deprecated/unsupported - econf \ - --disable-tcl \ - --enable-shm \ - $(use_enable dbus) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable ntlm) \ - $(use_enable perl) \ - $(usex python "--enable-python=${EPYTHON}" "--disable-python") \ - $(use_enable spell spell static) \ - $(use_enable ssl openssl) \ - $(use_enable gtk gtkfe) \ - $(use_enable !gtk textfe) \ - $(use_enable fastscroll xft) \ - $(use_enable plugins plugin) \ - $(use_enable plugin-checksum checksum) \ - $(use_enable plugin-doat doat) \ - $(use_enable plugin-fishlim fishlim) \ - $(use_enable plugin-sysinfo sysinfo) \ - $(use_enable libproxy) \ - $(use_enable libproxy socks) \ - $(use_enable libnotify) -} - -src_compile() { - default - if use theme-manager ; then - export XDG_CACHE_HOME="${T}/.cache" - cd src/htm || die - mdtool --verbose build htm-mono.csproj || die - fi -} - -src_install() { - default - if use theme-manager ; then - dobin src/htm/thememan.exe - make_wrapper thememan "mono /usr/bin/thememan.exe" - fi - prune_libtool_files --all -} - -pkg_preinst() { - if use gtk ; then - gnome2_icon_savelist - gnome2_gconf_savelist - fi -} - -pkg_postinst() { - if use !gtk ; then - einfo - elog "You have disabled the gtk USE flag. This means you don't have" - elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"." - else - gnome2_icon_cache_update - gnome2_gconf_install - fi - - if use theme-manager ; then - einfo - elog "Themes are available at:" - elog " http://hexchat.org/themes.html" - fi - - ewarn - ewarn "If you're upgrading from hexchat <=2.9.3 remember to rename" - ewarn "the xchat.conf file found in ~/.config/hexchat/ to hexchat.conf" - ewarn -} - -pkg_postrm() { - if use gtk ; then - gnome2_icon_cache_update - fi -} diff --git a/net-irc/hexchat/hexchat-2.9.4.ebuild b/net-irc/hexchat/hexchat-2.9.4.ebuild deleted file mode 100644 index bb1e2a348358..000000000000 --- a/net-irc/hexchat/hexchat-2.9.4.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.15 2013/03/09 14:26:07 ago Exp $ - -EAPI=5 - -inherit gnome2 flag-o-matic - -DESCRIPTION="Graphical IRC client based on XChat" -SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz" -HOMEPAGE="http://www.hexchat.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux" -IUSE="dbus fastscroll +gtk ipv6 libnotify libproxy nls ntlm perl +plugins python spell ssl threads" - -RDEPEND="dev-libs/glib:2 - x11-libs/pango - dbus? ( >=dev-libs/dbus-glib-0.98 ) - gtk? ( x11-libs/gtk+:2 ) - libnotify? ( x11-libs/libnotify ) - ntlm? ( net-libs/libntlm ) - perl? ( >=dev-lang/perl-5.8.0 ) - python? ( =dev-lang/python-2* ) - spell? ( dev-libs/libxml2 ) - libproxy? ( net-libs/libproxy ) - ssl? ( >=dev-libs/openssl-0.9.8u )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -DOCS="share/doc/changelog.md share/doc/readme.md" - -pkg_setup() { - # Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org> - if [[ ${ARCH} = sparc ]] ; then - replace-flags "-O[3-9]" "-O2" - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.9.1-input-box.patch \ - "${FILESDIR}"/${PN}-2.9.3-cflags.patch - - # use $libdir/hexchat/plugins as the plugin directory - if [[ $(get_libdir) != "lib" ]] ; then - sed -e 's:${prefix}/lib/hexchat:${libdir}/hexchat:' \ - -i configure.ac || die 'sed failed' - fi - - # Fix to compile with USE=-gtk when there is no gtk installed - if ! use gtk ; then - sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die 'sed failed' - fi - - mkdir "m4" || die "mkdir failed" - ./autogen.sh || die "autogen.sh failed" -} - -src_configure() { - econf \ - --disable-tcl \ - --enable-shm \ - $(use_enable dbus) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable ntlm) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable spell spell static) \ - $(use_enable ssl openssl) \ - $(use_enable gtk gtkfe) \ - $(use_enable !gtk textfe) \ - $(use_enable fastscroll xft) \ - $(use_enable plugins plugin) \ - $(use_enable plugins checksum) \ - $(use_enable plugins doat) \ - $(use_enable plugins fishlim) \ - $(use_enable plugins sysinfo) \ - $(use_enable libproxy) \ - $(use_enable libproxy socks) \ - $(use_enable threads) -} - -src_install() { - default - prune_libtool_files --all - - # install plugin development header - doheader src/common/"${PN}"-plugin.h - - # remove useless desktop entry when gtk USE flag is unset - use gtk || rm "${ED}"/usr/share/applications -rf -} - -pkg_postinst() { - if use !gtk ; then - elog "You have disabled the gtk USE flag. This means you don't have" - elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"." - fi - - ewarn "If you're upgrading from hexchat <=2.9.3 remember to rename" - ewarn "the xchat.conf file found in ~/.config/hexchat/ to hexchat.conf" - - gnome2_icon_cache_update -} |