Version bump (bug #520088) and add myself as primary maintainer.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 155 insertions, 24 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 80f32589470a..ff87f79c512c 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.144 2014/11/28 13:37:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.145 2014/11/29 00:16:40 radhermit Exp $
+
+*weechat-1.0.1 (29 Nov 2014)
+
+  29 Nov 2014; Tim Harder <radhermit@gentoo.org> +weechat-1.0.1.ebuild,
+  weechat-9999.ebuild, metadata.xml:
+  Version bump (bug #520088) and add myself as primary maintainer.
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> weechat-0.4.3-r1.ebuild,
   weechat-9999.ebuild:
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 082dce77884e..11c2108db25c 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -3,16 +3,21 @@
 <pkgmetadata>
 	<herd>net-irc</herd>
 	<maintainer>
+		<email>radhermit@gentoo.org</email>
+	</maintainer>
+	<maintainer>
 		<email>scarabeus@gentoo.org</email>
 	</maintainer>
 	<use>
 		<flag name="alias">Enable plugin for alias control.</flag>
 		<flag name="charset">Enable encoding conversions.</flag>
+		<flag name="exec">Enable exec plugin.</flag>
 		<flag name="fifo">Enable FIFO support (sh pipes).</flag>
 		<flag name="logger">Enable support for logging.</flag>
 		<flag name="relay">Enable relay plugin (experimental)</flag>
 		<flag name="rmodifier">Enable rmodifier plugin.</flag>
 		<flag name="scripts">Build infrastructure for scripting.</flag>
+		<flag name="trigger">Enable trigger plugin.</flag>
 		<flag name="xfer">Enable xfer plugin support.</flag>
 		<flag name="irc">Enable IRC protocol support.</flag>
 	</use>
diff --git a/net-irc/weechat/weechat-1.0.1.ebuild b/net-irc/weechat/weechat-1.0.1.ebuild
new file mode 100644
index 000000000000..c05ee89a3237
--- /dev/null
+++ b/net-irc/weechat/weechat-1.0.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.0.1.ebuild,v 1.1 2014/11/29 00:16:40 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit eutils python-single-r1 multilib cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="http://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
+#INTERFACES="+ncurses gtk"
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt_BR ru tr"
+IUSE="doc nls +ssl ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+#REQUIRED_USE=" || ( ncurses gtk )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( dev-scheme/guile )
+	lua? ( dev-lang/lua[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( >=dev-lang/ruby-1.9 )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15 )
+"
+#	ncurses? ( sys-libs/ncurses )
+#	gtk? ( x11-libs/gtk+:2 )
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local i
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	for i in ${LANGS} ; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \
+			| sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e '/ADD_SUBDIRECTORY( '${i}' )/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+}
+
+src_configure() {
+	# $(cmake-utils_use_enable gtk)
+	# $(cmake-utils_use_enable ncurses)
+	local mycmakeargs=(
+		"-DENABLE_NCURSES=ON"
+		"-DENABLE_LARGEFILE=ON"
+		"-DENABLE_DEMO=OFF"
+		"-DENABLE_GTK=OFF"
+		"-DPYTHON_EXECUTABLE=${PYTHON}"
+		$(cmake-utils_use_enable alias)
+		$(cmake-utils_use_enable doc)
+		$(cmake-utils_use_enable charset)
+		$(cmake-utils_use_enable exec)
+		$(cmake-utils_use_enable fifo)
+		$(cmake-utils_use_enable guile)
+		$(cmake-utils_use_enable irc)
+		$(cmake-utils_use_enable logger)
+		$(cmake-utils_use_enable lua)
+		$(cmake-utils_use_enable nls)
+		$(cmake-utils_use_enable perl)
+		$(cmake-utils_use_enable python)
+		$(cmake-utils_use_enable relay)
+		$(cmake-utils_use_enable ruby)
+		$(cmake-utils_use_enable scripts)
+		$(cmake-utils_use_enable scripts script)
+		$(cmake-utils_use_enable spell ASPELL)
+		$(cmake-utils_use_enable ssl GNUTLS)
+		$(cmake-utils_use_enable tcl)
+		$(cmake-utils_use_enable trigger)
+		$(cmake-utils_use_enable xfer)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index c64268b60039..fdafebf2c4d4 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,34 +1,35 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.34 2014/11/28 13:37:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.35 2014/11/29 00:16:40 radhermit Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit eutils python-single-r1 multilib cmake-utils
 
-EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-[[ ${PV} == "9999" ]] && GIT_ECLASS="git-r3"
-inherit eutils python-single-r1 multilib cmake-utils ${GIT_ECLASS}
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
 HOMEPAGE="http://weechat.org/"
-[[ ${PV} == "9999" ]] || SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
 
 NETWORKS="+irc"
-PLUGINS="+alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer"
+PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
 #INTERFACES="+ncurses gtk"
 SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} doc nls +ssl"
+LANGS=" cs de es fr hu it ja pl pt_BR ru tr"
+IUSE="doc nls +ssl ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+#REQUIRED_USE=" || ( ncurses gtk )"
 
 RDEPEND="
-	dev-libs/libgcrypt:0
+	dev-libs/libgcrypt:0=
 	net-misc/curl[ssl]
 	sys-libs/ncurses
 	sys-libs/zlib
@@ -55,13 +56,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
 
-#REQUIRED_USE=" || ( ncurses gtk )"
-
-LANGS=( cs de es fr hu it ja pl pt_BR ru )
-for X in "${LANGS[@]}" ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -76,7 +70,7 @@ src_prepare() {
 		CMakeLists.txt || die "sed failed"
 
 	# install only required translations
-	for i in "${LANGS[@]}" ; do
+	for i in ${LANGS} ; do
 		if ! use linguas_${i} ; then
 			sed -i \
 				-e "/${i}.po/d" \
@@ -107,6 +101,7 @@ src_configure() {
 		$(cmake-utils_use_enable alias)
 		$(cmake-utils_use_enable doc)
 		$(cmake-utils_use_enable charset)
+		$(cmake-utils_use_enable exec)
 		$(cmake-utils_use_enable fifo)
 		$(cmake-utils_use_enable guile)
 		$(cmake-utils_use_enable irc)
@@ -116,13 +111,13 @@ src_configure() {
 		$(cmake-utils_use_enable perl)
 		$(cmake-utils_use_enable python)
 		$(cmake-utils_use_enable relay)
-		$(cmake-utils_use_enable rmodifier)
 		$(cmake-utils_use_enable ruby)
 		$(cmake-utils_use_enable scripts)
 		$(cmake-utils_use_enable scripts script)
 		$(cmake-utils_use_enable spell ASPELL)
 		$(cmake-utils_use_enable ssl GNUTLS)
 		$(cmake-utils_use_enable tcl)
+		$(cmake-utils_use_enable trigger)
 		$(cmake-utils_use_enable xfer)
 	)