x11-plugins/gaim-plugin_pack: Fix plugin selection and general fixing

svn path=/sunrise/; revision=3215

diff --git a/x11-plugins/gaim-plugin_pack/ChangeLog b/x11-plugins/gaim-plugin_pack/ChangeLog
index 174857c6d8f45680deabc2a75f4a74ac75f7a3b7..42d05ea5f66924b4107bb859bf3127a2b9512a8a 100644 (file)
--- a/x11-plugins/gaim-plugin_pack/ChangeLog
+++ b/x11-plugins/gaim-plugin_pack/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Mar 2007; Santiago M. Mola <cooldwind@gmail.com>
+  gaim-plugin_pack-1.0_beta6.ebuild:
+  Fix plugin selection and general fixing
+
   07 Mar 2007; Jakub Moc <jakub@gentoo.org>
   gaim-plugin_pack-1.0_beta6.ebuild:
   Fix DEPEND, cosmetics

diff --git a/x11-plugins/gaim-plugin_pack/Manifest b/x11-plugins/gaim-plugin_pack/Manifest
index 9a7de0d9714a3617c259cf87010fb219b75b5911..cfe56c8556e502ad841c4eef4e739c4cae4178aa 100644 (file)
--- a/x11-plugins/gaim-plugin_pack/Manifest
+++ b/x11-plugins/gaim-plugin_pack/Manifest
@@ -1,4 +1,4 @@
 DIST gaim-plugin_pack-1.0beta6.tar.bz2 408780 RMD160 f0c793dfb55eebad139e43150794b95187fae963 SHA1 11da2e2e0d731dae32bda11196ea09a846b650e0 SHA256 8fc911fd2908b465bcbe8b64bda557d4196aa941d21ca3ffed9c42ad1d6b32ab
-EBUILD gaim-plugin_pack-1.0_beta6.ebuild 1892 RMD160 2d8b9a644d751b9ca1e8915ac60af95643ba8609 SHA1 00faa1f7bcb3b3a0971952a770434a0d7524107f SHA256 627d40743fa641ff6fcc9cf3ddba6f8a02ee3e538d934e0ab8d0d8e6d5ff6203
-MISC ChangeLog 334 RMD160 6ab47139bed19fe80e1f930291ca3ab71535cf5c SHA1 d80a291d469268b9ce0335c291bae0eeb15c9102 SHA256 6024506af11fe5139a8f374a9f4f48cbdf73633b528bf1752c8b5f981488955e
+EBUILD gaim-plugin_pack-1.0_beta6.ebuild 1970 RMD160 85e698a07e03c2cd472be8955f515cac3cf24c39 SHA1 10cee6032c5d36b053c6f5f87c973cc9a0e081bc SHA256 38d000b281983e3a136817772b7b525c7319e317e1b246e451366a5623cdfff3
+MISC ChangeLog 468 RMD160 eb349ea25fdeb7c8f8aab9dbfedca454294e52d6 SHA1 03cef98d2653d2ed28419ffc1ea9470c32dc23ef SHA256 2ab21ebc61d54ca6e1562430a4a152fef7b01704b4cbf7cd3c2d5eb0a553820b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/x11-plugins/gaim-plugin_pack/gaim-plugin_pack-1.0_beta6.ebuild b/x11-plugins/gaim-plugin_pack/gaim-plugin_pack-1.0_beta6.ebuild
index 71bddc5ee1d82b92761839bf35d440de4985ba81..3fbe4de23aab8d6a4d6720a896127ea06c137414 100644 (file)
--- a/x11-plugins/gaim-plugin_pack/gaim-plugin_pack-1.0_beta6.ebuild
+++ b/x11-plugins/gaim-plugin_pack/gaim-plugin_pack-1.0_beta6.ebuild
@@ -12,15 +12,16 @@ SRC_URI="http://downloads.guifications.org/gaim-plugins/Plugin%20Pack/${MY_P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-FLAGS="autorejoin awaynotify bit blistops dice difftopic eight_ball flip \
-gRIM groupmsg irssi lastseen listhandler mystatusbox nicksaid oldlogger \
+PLUGINS="autorejoin awaynotify bashorg bit blistops dice difftopic eight_ball
+flip gRIM groupmsg irssi lastseen listhandler mystatusbox nicksaid oldlogger
 plonkers sepandtab showoffline simfix slashexec sslinfo talkfilters xchat-chats"
-IUSE="${FLAGS} bashorg debug"
+IUSE="${PLUGINS} debug"
 
 DEPEND="~net-im/gaim-2.0.0_beta6
        talkfilters? ( app-text/talkfilters )"
+RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
        einfo "The plugins that are to be built are configured via use flags."
@@ -44,22 +45,24 @@ src_compile() {
        # New Line
        # Offline Message
 
-       local myconf="--with-plugins="
+       local myconf=""
+       local plugins=${PLUGINS/bashorg/bash}
+       local myplugins=""
 
-       # bashorg has to add "bash" to the configure
-       use bashorg && myconf="${myconf}bash,"
-
-       for flag in $FLAGS ; do
-               if use ${flag} ; then
-                       myconf="${myconf}${flag},"
-               fi
+       for plugin in ${plugins} ; do
+               use ${plugin} && myplugins="${myplugins}${plugin},"
        done
+       if [ ! -z ${myplugins} ] ; then
+               myconf="--with-plugins=${myplugins}"
+       else
+               myconf="--with-plugins=${plugins}"
+       fi
 
-       econf "${myconf}" $(use_enable debug) || die "Configuration failed with the configuration $myconf"
+       econf "${myconf}" $(use_enable debug) || die "econf failed with ${myconf}"
        emake -j1 || die "emake failed"
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "install failed"
+       emake DESTDIR="${D}" install || die "emake install failed"
        dodoc AUTHORS ChangeLog NEWS README TODO VERSION
 }