Version bump, use emake, quoting and such.

(Portage version: 2.1.4.4)

6 files changed, 42 insertions, 107 deletions

diff --git a/x11-themes/gtk-engines-cleanice/ChangeLog b/x11-themes/gtk-engines-cleanice/ChangeLog
index 798053219b44..75c04e1f9506 100644
--- a/x11-themes/gtk-engines-cleanice/ChangeLog
+++ b/x11-themes/gtk-engines-cleanice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines-cleanice
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/ChangeLog,v 1.23 2007/08/13 22:06:27 dertobi123 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/ChangeLog,v 1.24 2008/03/21 12:40:54 drac Exp $
+
+*gtk-engines-cleanice-2.4.1 (21 Mar 2008)
+
+  21 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  -gtk-engines-cleanice-0.8.5.ebuild, -gtk-engines-cleanice-0.8.5-r1.ebuild,
+  -gtk-engines-cleanice-1.2.7.ebuild, gtk-engines-cleanice-2.4.0.ebuild,
+  +gtk-engines-cleanice-2.4.1.ebuild:
+  Version bump, use emake, quoting and such.
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   gtk-engines-cleanice-0.8.5-r1.ebuild:
diff --git a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5-r1.ebuild b/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5-r1.ebuild
deleted file mode 100644
index 38467cbb9f03..000000000000
--- a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5-r1.ebuild,v 1.4 2007/08/13 22:06:27 dertobi123 Exp $
-
-MY_PN="gtk-cleanice-theme"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cleanice theme engine for GTK+ 1"
-HOMEPAGE="http://themes.freshmeat.net/"
-SRC_PATH="${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
-SRC_URI="mirror://debian/pool/main/${SRC_PATH}"
-
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc x86"
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="static"
-
-DEPEND="=x11-libs/gtk+-1.2*"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf="$(use_enable static)"
-
-	econf $myconf || die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5.ebuild b/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5.ebuild
deleted file mode 100644
index 03f3152b31d7..000000000000
--- a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-0.8.5.ebuild,v 1.7 2005/08/24 00:40:51 leonardop Exp $
-
-MY_PN="gtk-cleanice-theme"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cleanice theme engine for GTK+ 1"
-HOMEPAGE="http://themes.freshmeat.net/"
-SRC_PATH="${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
-SRC_URI="mirror://debian/pool/main/${SRC_PATH}"
-
-KEYWORDS="x86 ppc alpha sparc hppa amd64"
-LICENSE="GPL-2"
-SLOT="1"
-IUSE=""
-
-DEPEND="=x11-libs/gtk+-1.2*"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-1.2.7.ebuild b/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-1.2.7.ebuild
deleted file mode 100644
index 6dd2ed36a0f7..000000000000
--- a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-1.2.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-1.2.7.ebuild,v 1.11 2005/08/02 08:48:00 leonardop Exp $
-
-DESCRIPTION="GTK+2 Cleanice Theme Engine"
-HOMEPAGE="http://sourceforge.net/projects/elysium-project/"
-SRC_URI="mirror://sourceforge/elysium-project/cleanice-theme-${PV}.tar.gz"
-
-KEYWORDS="x86 ppc sparc alpha ia64 hppa amd64"
-LICENSE="GPL-2"
-IUSE=""
-SLOT="2"
-S=${WORKDIR}/cleanice-theme-${PV}
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.0.ebuild b/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.0.ebuild
index 99b161999589..fd41c222dd95 100644
--- a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.0.ebuild
+++ b/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.0.ebuild
@@ -1,35 +1,23 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.0.ebuild,v 1.9 2006/10/09 17:50:29 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.0.ebuild,v 1.10 2008/03/21 12:40:54 drac Exp $
 
-DESCRIPTION="GTK+2 Cleanice Theme Engine"
-HOMEPAGE="http://sourceforge.net/projects/elysium-project/"
+DESCRIPTION="GTK+ CleanIce Theme Engine"
+HOMEPAGE="http://sourceforge.net/projects/elysium-project"
 SRC_URI="mirror://sourceforge/elysium-project/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
 LICENSE="GPL-2"
-IUSE="static"
 SLOT="2"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2"
-
+RDEPEND=">=x11-libs/gtk+-2.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
-	local myconf="$(use_enable static)"
-
-	econf $myconf || die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
 src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	# Install sample theme
+	emake DESTDIR="${D}" install || die "emake install failed."
 	insinto /usr/share/themes/CleanIce/gtk-2.0
-	newins ${FILESDIR}/cleanice-2-gtkrc gtkrc
-
+	newins "${FILESDIR}"/cleanice-2-gtkrc gtkrc
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.1.ebuild b/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.1.ebuild
new file mode 100644
index 000000000000..bde54b5d46ed
--- /dev/null
+++ b/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.1.ebuild,v 1.1 2008/03/21 12:40:54 drac Exp $
+
+DESCRIPTION="GTK+ CleanIce Theme Engine"
+HOMEPAGE="http://sourceforge.net/projects/elysium-project"
+SRC_URI="mirror://sourceforge/elysium-project/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	insinto /usr/share/themes/CleanIce/gtk-2.0
+	newins "${FILESDIR}"/cleanice-2-gtkrc gtkrc
+	dodoc AUTHORS ChangeLog README
+}