9 files changed, 21 insertions, 59 deletions
diff --git a/x11-themes/lipstik/ChangeLog b/x11-themes/lipstik/ChangeLog
index 3cbc5c03521b..467a3dd20e04 100644
--- a/x11-themes/lipstik/ChangeLog
+++ b/x11-themes/lipstik/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/lipstik
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/ChangeLog,v 1.18 2006/11/28 00:40:39 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/ChangeLog,v 1.19 2007/02/22 10:36:23 voxus Exp $
+
+*lipstik-2.2.2 (22 Feb 2007)
+
+  22 Feb 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -lipstik-1.3.ebuild, -lipstik-1.3-r1.ebuild, -lipstik-2.1.ebuild,
+  lipstik-2.2.ebuild, +lipstik-2.2.2.ebuild:
+  Version bump, SRC_URI fixed (wrt bug #167368).
 
   28 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> lipstik-2.2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/x11-themes/lipstik/files/digest-lipstik-1.3 b/x11-themes/lipstik/files/digest-lipstik-1.3
deleted file mode 100644
index d3bcb7efff7a..000000000000
--- a/x11-themes/lipstik/files/digest-lipstik-1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c5ac975491cf1d7b7b1ae0ceebffa25f 18223-lipstik-1.3.tar.bz2 408569
-RMD160 43489cc2bc28592c965cd0851e74a169e707e3c1 18223-lipstik-1.3.tar.bz2 408569
-SHA256 4fa8f19bbbe999e506914f5974cdb3e95b9313d0cb1c1070bff51ea21162b607 18223-lipstik-1.3.tar.bz2 408569
diff --git a/x11-themes/lipstik/files/digest-lipstik-1.3-r1 b/x11-themes/lipstik/files/digest-lipstik-1.3-r1
deleted file mode 100644
index d3bcb7efff7a..000000000000
--- a/x11-themes/lipstik/files/digest-lipstik-1.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c5ac975491cf1d7b7b1ae0ceebffa25f 18223-lipstik-1.3.tar.bz2 408569
-RMD160 43489cc2bc28592c965cd0851e74a169e707e3c1 18223-lipstik-1.3.tar.bz2 408569
-SHA256 4fa8f19bbbe999e506914f5974cdb3e95b9313d0cb1c1070bff51ea21162b607 18223-lipstik-1.3.tar.bz2 408569
diff --git a/x11-themes/lipstik/files/digest-lipstik-2.1 b/x11-themes/lipstik/files/digest-lipstik-2.1
deleted file mode 100644
index d55e6552067f..000000000000
--- a/x11-themes/lipstik/files/digest-lipstik-2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f7e576c615511d26209889e92aeb5c8 18223-lipstik-2.1.tar.bz2 440602
-RMD160 10cc566f70150a2939895a043bae3a9470cb6e1b 18223-lipstik-2.1.tar.bz2 440602
-SHA256 c7fab090a46cddaae56eac8a74319eaeba4379740a49fd7419c74a495e66b802 18223-lipstik-2.1.tar.bz2 440602
diff --git a/x11-themes/lipstik/files/digest-lipstik-2.2.2 b/x11-themes/lipstik/files/digest-lipstik-2.2.2
new file mode 100644
index 000000000000..17bb571457ad
--- /dev/null
+++ b/x11-themes/lipstik/files/digest-lipstik-2.2.2
@@ -0,0 +1,3 @@
+MD5 06656d6778f845e873026f114b6a9d2c 18223-lipstik-2.2.2.tar.bz2 421736
+RMD160 5ba407911a5f0bae2787a1b40aa64d8e2bdc5be2 18223-lipstik-2.2.2.tar.bz2 421736
+SHA256 6546d980d785aa146804f830cdcee923ed415681650d1f497482a58a0343656c 18223-lipstik-2.2.2.tar.bz2 421736
diff --git a/x11-themes/lipstik/lipstik-1.3-r1.ebuild b/x11-themes/lipstik/lipstik-1.3-r1.ebuild
deleted file mode 100644
index 2b8795454bf9..000000000000
--- a/x11-themes/lipstik/lipstik-1.3-r1.ebuild
+++ /dev/null
@@ -1,22 +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/lipstik/lipstik-1.3-r1.ebuild,v 1.2 2005/10/01 15:03:49 voxus Exp $
-
-inherit kde
-
-KLV=18223
-DESCRIPTION="Lipstik is a purified style with many options to tune your
-desktop look"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=${KLV}"
-SRC_URI="http://www.kde-look.org/content/files/${KLV}-${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-RESTRICT="nomirror ${RESTRICT}"
-
-need-kde 3.3
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S} && epatch ${FILESDIR}/${P}-lower_case.patch
-}
diff --git a/x11-themes/lipstik/lipstik-1.3.ebuild b/x11-themes/lipstik/lipstik-1.3.ebuild
deleted file mode 100644
index bf81c0306765..000000000000
--- a/x11-themes/lipstik/lipstik-1.3.ebuild
+++ /dev/null
@@ -1,17 +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/lipstik/lipstik-1.3.ebuild,v 1.3 2005/08/27 23:22:23 voxus Exp $
-
-inherit kde
-
-KLV=18223
-DESCRIPTION="Lipstik is a purified style with many options to tune your
-desktop look"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=${KLV}"
-SRC_URI="http://www.kde-look.org/content/files/${KLV}-${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-RESTRICT="nomirror ${RESTRICT}"
-
-need-kde 3.3
diff --git a/x11-themes/lipstik/lipstik-2.1.ebuild b/x11-themes/lipstik/lipstik-2.2.2.ebuild
index 2e739d7a2e83..49378b14aba7 100644
--- a/x11-themes/lipstik/lipstik-2.1.ebuild
+++ b/x11-themes/lipstik/lipstik-2.2.2.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/lipstik-2.1.ebuild,v 1.3 2006/02/14 18:02:11 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/lipstik-2.2.2.ebuild,v 1.1 2007/02/22 10:36:23 voxus Exp $
 
 inherit kde
 
 KLV=18223
 DESCRIPTION="Lipstik is a purified style with many options to tune your
 desktop look"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=${KLV}"
-SRC_URI="http://www.kde-look.org/content/files/${KLV}-${P}.tar.bz2"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=18223"
+SRC_URI="http://www.kde-look.org/CONTENT/content-files/${KLV}-${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 RESTRICT="nomirror ${RESTRICT}"
 
 need-kde 3.3
 
 src_unpack() {
 	kde_src_unpack
-	cd ${S} && epatch ${FILESDIR}/${P}-lower_case.patch
+	cd ${S} && epatch ${FILESDIR}/${PN}-2.2-lower_case.patch
 }
diff --git a/x11-themes/lipstik/lipstik-2.2.ebuild b/x11-themes/lipstik/lipstik-2.2.ebuild
index 5a5181a6f081..e0fe333f8709 100644
--- a/x11-themes/lipstik/lipstik-2.2.ebuild
+++ b/x11-themes/lipstik/lipstik-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/lipstik-2.2.ebuild,v 1.8 2006/11/28 00:40:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/lipstik-2.2.ebuild,v 1.9 2007/02/22 10:36:23 voxus Exp $
 
 inherit kde
 
@@ -8,7 +8,7 @@ KLV=18223
 DESCRIPTION="Lipstik is a purified style with many options to tune your
 desktop look"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=18223"
-SRC_URI="http://www.kde-look.org/content/files/${KLV}-${P}.tar.bz2"
+SRC_URI="http://www.kde-look.org/CONTENT/content-files/${KLV}-${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"