From 3289521f8ab1e2626a69fdda84a1a30cc744d3c2 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 3 Apr 2013 17:48:56 +0000 Subject: fix libnotify useflag, remove threads useflag (does nothing) Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3 --- net-irc/hexchat/ChangeLog | 8 +- net-irc/hexchat/Manifest | 18 ++--- net-irc/hexchat/hexchat-2.9.4-r1.ebuild | 138 -------------------------------- net-irc/hexchat/hexchat-2.9.4-r2.ebuild | 138 ++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 148 deletions(-) delete mode 100644 net-irc/hexchat/hexchat-2.9.4-r1.ebuild create mode 100644 net-irc/hexchat/hexchat-2.9.4-r2.ebuild (limited to 'net-irc') diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog index 9e7d5aaafc54..7e3263e203d9 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.37 2013/03/31 15:17:14 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.38 2013/04/03 17:48:51 hasufell Exp $ + +*hexchat-2.9.4-r2 (03 Apr 2013) + + 03 Apr 2013; Julian Ospald -hexchat-2.9.4-r1.ebuild, + +hexchat-2.9.4-r2.ebuild: + fix libnotify useflag, remove threads useflag (does nothing) 31 Mar 2013; Julian Ospald hexchat-2.9.4-r1.ebuild: remove -O3 hack wrt #461520 diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest index 13ad8d4fab5e..61cd6ecae0a6 100644 --- a/net-irc/hexchat/Manifest +++ b/net-irc/hexchat/Manifest @@ -8,18 +8,18 @@ AUX hexchat-2.9.4-build.patch 4530 SHA256 3483c66f4a5231efb140ff651184cefef305e6 DIST hexchat-2.9.3.tar.xz 1740220 SHA256 39e33462dbd44281819af805e1adda5e7c81c69a0b8bcc01ba61098dcbdf3d8c SHA512 62f5b09bd164da37b7722475b2442bdda5c9ecf33f98119a680aaa2be25867714ab5f9a57a2586af4c57dfd5af7dd2a0df9e3ee1e29fcfe3a30c515260a368f9 WHIRLPOOL 1c74d4ac3141ee1b2d8fdfa495c84f5224463b2fea88d18e88821be528bb6795507b40759e2da1a0ea6895ee3f3d135286e7d3d1b8fd0260a7a5f8c69b77be77 DIST hexchat-2.9.4.tar.xz 1535324 SHA256 0705cc3a6b16d1adf367e52583d852dc35dfe20930057aebc2758784fa8ec6e6 SHA512 cd2fc1d4ca1d7cce4ac78dcb15bf8862e6fbe39e7ce981ed7544c9cdc0a5653a6e6493c149d1e40d36edf6e948223f079366431f129ea3440a66d3afe56db5d3 WHIRLPOOL 17cdc44e95b64331dca2eee4de22ccfa8812d165d828b4a17e33f905ef6b470ce593c4bf0482219c79088e79533dff9a9335f6dc88b3a86492c9a643c540c872 EBUILD hexchat-2.9.3.ebuild 2667 SHA256 c2e98dc5ba6d68e0cb9f5f1f9e68d52c6be4c40a1f9c7c31c07aefa5ae30c0c6 SHA512 a938567651b72f07b210bd069f571fd7dc0e94aeef8e5e3f388526bae8cea6039d6a59727041a9a145591d74f848ad3fa1e3d5a3447d01ac7d9d73a051cc37ad WHIRLPOOL a6062c39d3d25a6eaf6780cb9493eeca91db7dd0abbd1833783ceff9bbf872fb617489195f9aace990a29c53a239e93d6e3d58a5233b8d659a380888034c3a82 -EBUILD hexchat-2.9.4-r1.ebuild 3699 SHA256 b71c3e30e83de355972a1973d468884846ed9b52d3d17837fe6265a75e6ccf9e SHA512 0e14708e58c6069c2df5ebb2d04aca4bc6321c28ddf4102d6fc784ccd3696d378be864dd03b8961b727fa467f9b44de03a57b67f67c4df835bfee02a5b358014 WHIRLPOOL f23ebd5b9e246fbf957b0a5c73922ea257f0e36c278adbff5a31b278c4164a31af8283932d69eb1590af812ef6f51decd9fe51af75fd3a43c5383af9d6b8adcd +EBUILD hexchat-2.9.4-r2.ebuild 3701 SHA256 d0512a6cb24cb999f52899f522c9582343dd9d48924765d71f28092df532c060 SHA512 e8186a7b62d6da12e34c7a540a26d9b1a674d61ae860c083fe6cbaea6a7b50eb4a49d7a64b6dcacf6a61c3d418ad0cef0ade7b6cf6e3387f4f5d6f2b5847b95e WHIRLPOOL fca68fe5d9545bcd7ad8692a7d357541f919e6439a7ba15c3e41359353532013f8b0763f95833bf105b1e0de20e5cb7e9a968a90b97a1bf528d2b0f1eafd5be9 EBUILD hexchat-2.9.4.ebuild 2954 SHA256 914ec267c80d7cc34c1534143ace5f718123d74591e4dcd6240218713ea86f18 SHA512 d494f42192bb45052737e33ca64c28101e503e71e5531065555ae7eb697576c28eaf4e9d57ce3e1ce538c4397ff4659d9d8f280a0826a5751da82f77c45f9558 WHIRLPOOL 82d602004bc47b2b723749edd1ab80f210a5e657afd2dbdce199b096de5edb66184328ec8e92ae74ddee54c66b64a576b31a6d5f469c1c1b938d71ab41821ae6 -MISC ChangeLog 5202 SHA256 bf405128e68cde072041cee8426853f4a62bd022af977fd286f4d4a9a0f36f06 SHA512 76e04b3ad0925f1f555dab668a1d761474447d3a7bffa7c226ee4651396e2e8e72c6d8b21fa60bde333880a9c3bd568b75dd24de289cf147a0562c4b0cbad81e WHIRLPOOL 129f1b277e88257e175fd7b5c5711393dbbeab78cd322d3f0288e0cd1a6161277088ac5c6bfa1378a2548f06fb591dbee00c35d1a893949cbc674f1ee313a966 +MISC ChangeLog 5404 SHA256 74e8d9ed6d233b77c387247db9baeaae5538f36b3fa26ec60f8af993e6b0b97b SHA512 a89f60cd0227e25d6d91c1850c3024b4091eee4437437917fccfd0a209ca261ecfc4dc40d162c77b3eb5e77554c09b746756b468fd63bffc9da7bf60f7fcefbc WHIRLPOOL 68100c3833864b213b3ad8c6ea97aa989f1c320ce074bee04acca9efa9c116ab6766c232052211b92aa613d31bcc201a269cacc45d403f9476fd12de6d1b7625 MISC metadata.xml 1147 SHA256 d547362b8dc43f2f643e7e6a325cbc9cfb09a9845deb46b09ca76017dab9b5bc SHA512 badeb2307ffd19a713b323230ce2eaa82cb7d2b3ec82c0ce58cb4ab864ff6ad7519b0fb229739fb90e50190821cb6cf4915978a8ffa225cea2847b33ff21a6d1 WHIRLPOOL b5e5f57e39bbead602fa547a7f0e9e32679a5b9db10ce81a1a28adf59f8ca2f463ae123876300f501e44e9dc6c4f11d9c19eb7f137c1da3503a4a2d6bcf5e035 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRWZzEAAoJEFpvPKfnPDWzuLQIAKN9vJpx6QCFlkV3JyCIKz5d -aSp3ORq6QkGzjpOCpXCiCXSa3BK25SFBmWDQYvcxMSJvzjMumTdge8QpP225CFl2 -yU4AvrW0ghRcVxWHdkDXi7AQFh+r1zJcJ2bW832Q4D3LCdNrlIc+BG4sthT723cA -urBqDWtK8ke77NtksB4HzsGHmxKRHkwYSpQHw35Z6zFcFqg5pCs5VaIEMtyL5pgN -LwCUCrTsAcj6Z6QGG+cOspFSV7CzQSpMyzY5Y0qEio9J/5EppyAFRlwwpU6p7kIV -fky8GoZ+X2znHkoOSf1JiutF/vbMmTYX8vk4+g/r53pejSv1qaY1HlEVd0Rh8JI= -=aIK6 +iQEcBAEBCAAGBQJRXGuIAAoJEFpvPKfnPDWzXGIH/j265vjDSglivpX18/aIIUi6 +I4qw+rlYPifyG8XtOPYa2sOI3ASOG875XSs7YKOZUMldgmpO5m2OToSNuNg0EH2k +J1zSaQvDmIDhSaZO9+Ej249pjTgbphaePddVI5hyd6A3XMcByBJVCV+nq1M3+C2s +h/9xBnkMRQNe6WnHnGuiPa0nvmUJT7lSnt/xGFiyo6IIsU+gDF4tAG9YwZv5N0lD +Md9RaBFPWK9kS+Jlb2AotIqPOT/lBuG2crsoi0ovEUm79YmnC8UjPc5PAuoWJdNy +98dBbkFWKPkwxVJLe0AfzXDbX6k895Y63urCnLD4kmpmWSf7proOdFlkFMy12YU= +=8uja -----END PGP SIGNATURE----- diff --git a/net-irc/hexchat/hexchat-2.9.4-r1.ebuild b/net-irc/hexchat/hexchat-2.9.4-r1.ebuild deleted file mode 100644 index 3dc421cdc3aa..000000000000 --- a/net-irc/hexchat/hexchat-2.9.4-r1.ebuild +++ /dev/null @@ -1,138 +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-r1.ebuild,v 1.3 2013/04/01 14:42:14 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 threads" -REQUIRED_USE="plugin-checksum? ( plugins ) - plugin-doat? ( plugins ) - plugin-fishlim? ( plugins ) - plugin-sysinfo? ( plugins )" - -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 threads) -} - -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-r2.ebuild b/net-irc/hexchat/hexchat-2.9.4-r2.ebuild new file mode 100644 index 000000000000..3913c8d06cb9 --- /dev/null +++ b/net-irc/hexchat/hexchat-2.9.4-r2.ebuild @@ -0,0 +1,138 @@ +# 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.1 2013/04/03 17:48:51 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 threads" +REQUIRED_USE="plugin-checksum? ( plugins ) + plugin-doat? ( plugins ) + plugin-fishlim? ( plugins ) + plugin-sysinfo? ( plugins )" + +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 +} -- cgit v1.2.3-65-gdbad