3 files changed, 26 insertions, 39 deletions
diff --git a/net-misc/slimrat/Manifest b/net-misc/slimrat/Manifest
index 6cc780ca254..d1d447ec64e 100644
--- a/net-misc/slimrat/Manifest
+++ b/net-misc/slimrat/Manifest
@@ -1,4 +1,4 @@
 AUX 00-config-0.9.4.patch 276 RMD160 b73c7c0769ddd9787bee08b1c8479a7b202b423a SHA1 cd912b025f7de404dad0f27d476cbd324f056fd8 SHA256 79328003cd0f713f14313d0baa2299c9acfe4229607247f3c2c3b31a2715257c
 DIST slimrat-0.9.4.tar.bz2 14056 RMD160 8b88dd2b259391cd60be3539d0f52312e3447fd3 SHA1 a61be6be3d8d48a4742e7eb8c7a737a115c86eea SHA256 5dc8e2cb3f2e6ca2791effd4d17fcb825fcd0118ed16035eaf1b3751c724c392
-EBUILD slimrat-0.9.4.ebuild 1208 RMD160 00d6d77862b492f16294fc42aa93fda756166421 SHA1 41b0bd9a6242e237b2e236355d9e9ead0fe946dd SHA256 a947d14ce1483eff8e917947e8eee18624e568b4bafe42762201e9a8895bc5d7
-EBUILD slimrat-9999.ebuild 1207 RMD160 97f7589f6fe650bb8742d8244987dcf41f8c777c SHA1 b7ba2389aab183afacfdfaa6ca5155a39c90f47b SHA256 ee0d419415e6fb758908a7a72236efc7c7c02de98ddccdc71afe71dec0f3ebda
+EBUILD slimrat-0.9.4.ebuild 1136 RMD160 2618e2413bb6e4ef08f7ab3beb71d1521368cb33 SHA1 6aea2a6448f731346ee555e0d6d0468b21803afc SHA256 069be7659e4ca3f6f769d0fbfa61b791e091a2ec2e7cb2f993effd1a7004195b
+EBUILD slimrat-9999.ebuild 1134 RMD160 9709fa92a69dd4c2a6bfc2c93b0207e9a9da4dca SHA1 041a54bc274a54ece201dc6eebd2051166603ffd SHA256 15a1e9c61803ccf551937ed045ab8a3549f2e4170c1a6907026604b987c9f88e
diff --git a/net-misc/slimrat/slimrat-0.9.4.ebuild b/net-misc/slimrat/slimrat-0.9.4.ebuild
index 94d7f02c363..a4cd50deb70 100644
--- a/net-misc/slimrat/slimrat-0.9.4.ebuild
+++ b/net-misc/slimrat/slimrat-0.9.4.ebuild
@@ -13,13 +13,12 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X +cli"
+IUSE="X"
 
 DEPEND="dev-perl/WWW-Mechanize
-	cli? (
-		virtual/perl-Getopt-Long
-		virtual/perl-Term-ANSIColor
-	)
+	virtual/perl-Getopt-Long
+	virtual/perl-Term-ANSIColor
+
 	X? (
 		dev-perl/gtk2-gladexml
 		dev-perl/Spiffy
@@ -29,33 +28,28 @@ RDEPEND="${DEPEND}
 	X? ( x11-terms/xterm )
 	"
 
-pkg_setup() {
-	confutils_require_any X cli
-}
-
 src_prepare() {
 	esvn_clean
-	epatch  ${FILESDIR}/00-config-${PV}.patch
+	epatch  "${FILESDIR}/00-config-${PV}.patch"
 }
 
 src_install() {
 	# install binaries
 
-	exeinto ${ROOT}usr/share/${PN}
+	exeinto "${ROOT}usr/share/${PN}"
+
+	doexe ${PN} || die "doexe failed"
+	dosym "${ROOT}usr/share/${PN}/${PN}" "${ROOT}usr/bin/${PN}"
 
-	if use cli; then
-		doexe ${PN} || die "doexe failed"
-		dosym ${ROOT}usr/share/${PN}/${PN} ${ROOT}usr/bin/${PN}
-	fi
 	if use X; then
 		doexe ${PN}-gui || die "doexe failed"
-		dosym ${ROOT}usr/share/${PN}/${PN}-gui ${ROOT}usr/bin/${PN}-gui
+		dosym "${ROOT}usr/share/${PN}/${PN}-gui" "${ROOT}usr/bin/${PN}-gui"
 	fi
-	
+
 	# install data
 	insinto /etc
-	newins ${S}/config slimrat.conf
-	
-	insinto ${ROOT}usr/share/${PN}
+	newins "${S}/config" slimrat.conf
+
+	insinto "${ROOT}usr/share/${PN}"
 	doins -r Clipboard.pm Clipboard Plugin.pm plugins slimrat.glade Toolbox.pm || die "doins failed"
 }
diff --git a/net-misc/slimrat/slimrat-9999.ebuild b/net-misc/slimrat/slimrat-9999.ebuild
index 9f699c6fd20..b52a1dec74f 100644
--- a/net-misc/slimrat/slimrat-9999.ebuild
+++ b/net-misc/slimrat/slimrat-9999.ebuild
@@ -14,13 +14,11 @@ ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="X +cli"
+IUSE="X"
 
 DEPEND="dev-perl/WWW-Mechanize
-	cli? (
 		virtual/perl-Getopt-Long
 		virtual/perl-Term-ANSIColor
-	)
 	X? (
 		dev-perl/gtk2-gladexml
 		dev-perl/Spiffy
@@ -30,10 +28,6 @@ RDEPEND="${DEPEND}
 	X? ( x11-terms/xterm )
 	"
 
-pkg_setup() {
-	confutils_require_any X cli
-}
-
 src_prepare() {
 	esvn_clean
 }
@@ -41,21 +35,20 @@ src_prepare() {
 src_install() {
 	# install binaries
 
-	exeinto ${ROOT}usr/share/${PN}
+	exeinto "${ROOT}usr/share/${PN}"
+
+	doexe ${PN} || die "doexe failed"
+	dosym "${ROOT}usr/share/${PN}/${PN}" "${ROOT}usr/bin/${PN}"
 
-	if use cli; then
-		doexe ${PN} || die "doexe failed"
-		dosym ${ROOT}usr/share/${PN}/${PN} ${ROOT}usr/bin/${PN}
-	fi
 	if use X; then
 		doexe ${PN}-gui || die "doexe failed"
-		dosym ${ROOT}usr/share/${PN}/${PN}-gui ${ROOT}usr/bin/${PN}-gui
+		dosym "${ROOT}usr/share/${PN}/${PN}-gui" "${ROOT}usr/bin/${PN}-gui"
 	fi
-	
+
 	# install data
 	insinto /etc
-	newins ${S}/config slimrat.conf
-	
-	insinto ${ROOT}usr/share/${PN}
+	newins "${S}/config" slimrat.conf
+
+	insinto "${ROOT}usr/share/${PN}"
 	doins -r Clipboard.pm Clipboard Configuration.pm Log.pm Plugin.pm plugins Queue.pm slimrat.glade Toolbox.pm || die "doins failed"
 }