Add new snapshot. Update ebuild to avoid build failure with USE="-kde" wrt bug #484204. Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

3 files changed, 83 insertions, 41 deletions

diff --git a/x11-themes/bespin/ChangeLog b/x11-themes/bespin/ChangeLog
index d3d3ea4c0b3d..b4865d7d2a00 100644
--- a/x11-themes/bespin/ChangeLog
+++ b/x11-themes/bespin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/bespin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/ChangeLog,v 1.8 2014/02/10 15:47:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/ChangeLog,v 1.9 2014/02/25 17:57:01 kensington Exp $
+
+*bespin-0_p20140225 (25 Feb 2014)
+
+  25 Feb 2014; Michael Palimaka <kensington@gentoo.org>
+  +bespin-0_p20140225.ebuild, -bespin-0_p20120929.ebuild:
+  Add new snapshot. Update ebuild to avoid build failure with USE="-kde" wrt bug
+  #484204. Remove old.
 
 *bespin-0_p20131020 (10 Feb 2014)
 
diff --git a/x11-themes/bespin/bespin-0_p20120929.ebuild b/x11-themes/bespin/bespin-0_p20120929.ebuild
deleted file mode 100644
index 05446ece8ed9..000000000000
--- a/x11-themes/bespin/bespin-0_p20120929.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/bespin-0_p20120929.ebuild,v 1.4 2013/10/01 21:45:36 pesa Exp $
-
-EAPI=4
-KDE_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="Very configurable Qt4/KDE4 style derived from the Oxygen project."
-HOMEPAGE="http://cloudcity.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug kde plasma windeco"
-
-REQUIRED_USE="
-	windeco? ( kde )
-	plasma? ( kde )
-"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	windeco? ( $(add_kdebase_dep kwin) )
-	plasma? ( $(add_kdebase_dep kdelibs) dev-qt/qtdbus:4 )
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable kde KDE)
-		$(cmake-utils_use_enable windeco KWIN)
-		$(cmake-utils_use_enable windeco 474_SHADOWS)
-		$(cmake-utils_use_enable plasma XBAR)
-		-DENABLE_ARGB=ON
-	)
-
-	kde4-base_src_configure
-}
diff --git a/x11-themes/bespin/bespin-0_p20140225.ebuild b/x11-themes/bespin/bespin-0_p20140225.ebuild
new file mode 100644
index 000000000000..d2636df6674b
--- /dev/null
+++ b/x11-themes/bespin/bespin-0_p20140225.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/bespin-0_p20140225.ebuild,v 1.1 2014/02/25 17:57:01 kensington Exp $
+
+EAPI=5
+KDE_REQUIRED="optional"
+KDE_SCM="svn"
+
+inherit kde4-base qmake-utils
+
+if [[ $PV != *9999 ]]; then
+	REV="1712"
+	S="${WORKDIR}/cloudcity-code-${REV}"
+	SRC_URI="http://sourceforge.net/code-snapshots/svn/c/cl/cloudcity/code/cloudcity-code-${REV}.zip"
+	KEYWORDS="~amd64 ~x86"
+else
+	ESVN_REPO_URI="http://svn.code.sf.net/p/cloudcity/code/"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Very configurable Qt4/KDE4 style derived from the Oxygen project."
+HOMEPAGE="http://cloudcity.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug kde plasma windeco"
+
+REQUIRED_USE="
+	windeco? ( kde )
+	plasma? ( kde )
+"
+
+RDEPEND="
+	dev-qt/qt3support:4
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	x11-libs/libX11
+	x11-libs/libXrender
+	windeco? ( $(add_kdebase_dep kwin) )
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+src_configure() {
+	if use kde ; then
+		local mycmakeargs=(
+			$(cmake-utils_use_enable kde KDE)
+			$(cmake-utils_use_enable windeco KWIN)
+			$(cmake-utils_use_enable plasma XBAR)
+			-DENABLE_ARGB=ON
+		)
+
+		kde4-base_src_configure
+	else
+		eqmake4
+	fi
+}
+
+src_compile() {
+	if use kde ; then
+		kde4-base_src_compile
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use kde ; then
+		kde4-base_src_install
+	else
+		emake INSTALL_ROOT="${D}" install
+	fi
+}