* bump

(Portage version: 2.1_pre3-r1)

5 files changed, 171 insertions, 6 deletions

diff --git a/x11-themes/lipstik/ChangeLog b/x11-themes/lipstik/ChangeLog
index b3b8a10520eb..db413f3a1631 100644
--- a/x11-themes/lipstik/ChangeLog
+++ b/x11-themes/lipstik/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/lipstik
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/ChangeLog,v 1.6 2005/10/01 15:03:49 voxus Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/ChangeLog,v 1.7 2006/01/02 17:45:58 voxus Exp $
+
+*lipstik-2.1 (02 Jan 2006)
+
+  02 Jan 2006; Konstantin Arkhipov <voxus@gentoo.org> +lipstik-2.1.ebuild,
+  +files/lipstik-2.1-lower_case.patch:
+  Version bump, closing bug #115128.
 
   01 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> lipstik-1.3-r1.ebuild:
   Stable on amd64 and x86.
diff --git a/x11-themes/lipstik/Manifest b/x11-themes/lipstik/Manifest
index a5ee8a946290..96840750fbce 100644
--- a/x11-themes/lipstik/Manifest
+++ b/x11-themes/lipstik/Manifest
@@ -1,7 +1,10 @@
+MD5 8df1d75a163623f8ed797f2b9c58fe3d ChangeLog 1118
+MD5 35e6e2ded39053bad610a636e8317598 files/digest-lipstik-1.3 70
+MD5 35e6e2ded39053bad610a636e8317598 files/digest-lipstik-1.3-r1 70
+MD5 60788c7643a566613d15991717991696 files/digest-lipstik-2.1 70
+MD5 9615bd01c86a9ebbaa856e83c1d6da9b files/lipstik-1.3-lower_case.patch 5829
+MD5 8e06a9e9a93fce00fb2fc37515cec71f files/lipstik-2.1-lower_case.patch 6361
 MD5 12b9623b26efa9203bc5cad640a1598a lipstik-1.3-r1.ebuild 650
 MD5 8c5c7c8a8d30a1b08c064d3c4868d835 lipstik-1.3.ebuild 560
-MD5 2659a1812f5ffcd26b571fd0723d9b1e ChangeLog 938
+MD5 033e684078d25696d542c9a13b68425a lipstik-2.1.ebuild 652
 MD5 cb28be74814f0f6cbf78047995f51226 metadata.xml 233
-MD5 35e6e2ded39053bad610a636e8317598 files/digest-lipstik-1.3 70
-MD5 9615bd01c86a9ebbaa856e83c1d6da9b files/lipstik-1.3-lower_case.patch 5829
-MD5 35e6e2ded39053bad610a636e8317598 files/digest-lipstik-1.3-r1 70
diff --git a/x11-themes/lipstik/files/digest-lipstik-2.1 b/x11-themes/lipstik/files/digest-lipstik-2.1
new file mode 100644
index 000000000000..67f0a2b9f620
--- /dev/null
+++ b/x11-themes/lipstik/files/digest-lipstik-2.1
@@ -0,0 +1 @@
+MD5 0f7e576c615511d26209889e92aeb5c8 18223-lipstik-2.1.tar.bz2 440602
diff --git a/x11-themes/lipstik/files/lipstik-2.1-lower_case.patch b/x11-themes/lipstik/files/lipstik-2.1-lower_case.patch
new file mode 100644
index 000000000000..5f0b247a0fcc
--- /dev/null
+++ b/x11-themes/lipstik/files/lipstik-2.1-lower_case.patch
@@ -0,0 +1,133 @@
+--- lipstik-2.1/style/config/lipstikconf.cpp	2005-12-09 19:55:51.000000000 +0300
++++ lipstik-2.1/style/config/lipstikconf.cpp	2006-01-02 20:35:06.000000000 +0300
+@@ -81,6 +81,7 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+ //	newKickerButtons = new QCheckBox(i18n("Flat taskbar buttons"), generalGrp);
+ 	flatHeaders = new QCheckBox(i18n("Flatten Headers"), generalGrp);
+ 	tickCheckMark = new QCheckBox(i18n("Tick Checkmarks"), generalGrp);
++	lowerCaseText = new QCheckBox(i18n("Use lowercased text"), generalGrp);
+ 
+ 	tabLayout->addWidget(generalGrp,0,0,0);
+ 
+@@ -338,6 +339,9 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+  	origTickCheckMark = s.readBoolEntry("/lipstikstyle/Settings/tickCheckMark", true);
+ 	tickCheckMark->setChecked(origTickCheckMark);
+ 
++	origLowerCaseText = s.readBoolEntry("/lipstikstyle/Settings/lowerCaseText", false);
++	lowerCaseText->setChecked(origLowerCaseText);
++
+ 	origDrawTriangularExpander = s.readBoolEntry("/lipstikstyle/Settings/drawTriangularExpander", false);
+ 	drawTriangularExpander->setChecked(origDrawTriangularExpander);
+ 
+@@ -403,6 +407,7 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+  	connect(flatHeaders, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ 
+  	connect(tickCheckMark, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
++	connect(lowerCaseText, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ 
+ 	connect(drawTriangularExpander, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ 	connect(inputFocusHighlight, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+@@ -483,6 +488,7 @@ void LipstikStyleConfig::save()
+ 	s.writeEntry("/lipstikstyle/Settings/alterMenuGradients", alterMenuGradients->isChecked());
+ 	s.writeEntry("/lipstikstyle/Settings/menuLeftSideBar", menuLeftSideBar->isChecked());
+ 	s.writeEntry("/lipstikstyle/Settings/flatStripe", flatStripe->isChecked());
++	s.writeEntry("/lipstikstyle/Settings/lowerCaseText", lowerCaseText->isChecked());
+ 
+ 	s.writeEntry("/lipstikstyle/Settings/compressedMenus", compressedMenus->isChecked());
+ 
+@@ -535,6 +541,7 @@ void LipstikStyleConfig::defaults()
+ 	alterMenuGradients->setChecked(false);
+ 	menuLeftSideBar->setChecked(true);
+ 	flatStripe->setChecked(false);
++	lowerCaseText->setChecked(false);
+ 
+ 	compressedMenus->setChecked(false);
+ 
+@@ -649,6 +656,7 @@ void LipstikStyleConfig::updateChanged()
+ 	    (alterMenuGradients->isChecked() == origAlterMenuGradients) &&
+ 	    (menuLeftSideBar->isChecked() == origMenuLeftSideBar) &&
+ 	    (flatStripe->isChecked() == origFlatStripe) &&
++	    (lowerCaseText->isChecked() == origLowerCaseText) &&
+ 
+ 	    (compressedMenus->isChecked() == origCompressedMenus) &&
+ 
+--- lipstik-2.1/style/config/lipstikconf.h	2005-12-09 19:49:42.000000000 +0300
++++ lipstik-2.1/style/config/lipstikconf.h	2006-01-02 20:21:20.000000000 +0300
+@@ -83,6 +83,7 @@ protected:
+ 	QCheckBox* 	 kickerHighlight;
+ 	QCheckBox* 	 drawTabHighlight;
+ 	QCheckBox* 	 flatStripe;
++	QCheckBox* 	 lowerCaseText;
+ 	QCheckBox* 	 compressedMenus;
+ 
+ 	QCheckBox* 	 drawToolBarSeparator;
+@@ -122,6 +123,7 @@ protected:
+ 	bool       origKickerHighlight;
+ 	bool       origDrawTabHighlight;
+     	bool       origFlatStripe;
++    	bool       origLowerCaseText;
+     	bool       origCompressedMenus;
+ 
+ 	bool       origDrawToolBarSeparator;
+--- lipstik-2.1/style/lipstik.cpp	2005-12-10 15:24:24.000000000 +0300
++++ lipstik-2.1/style/lipstik.cpp	2006-01-02 20:29:03.000000000 +0300
+@@ -192,6 +192,8 @@ LipstikStyle::LipstikStyle() : KStyle( A
+     _customCheckMarkColor = settings.readBoolEntry("/customCheckMarkColor", false);
+     _checkMarkColor.setNamedColor( settings.readEntry("/checkMarkColor", "black") );
+ 
++    _lowerCaseText = settings.readBoolEntry("/lowerCaseText", false);
++
+     _drawStatusBarFrame = settings.readBoolEntry("/drawStatusBarFrame", false);
+     _scrollBarStyle = settings.readEntry("/scrollBarStyle", "WindowsStyleScrollBar");
+     _scrollBarWidth = settings.readEntry("/scrollBarWidth", "Normal");
+@@ -2709,7 +2711,8 @@ void LipstikStyle::drawControl(ControlEl
+ 
+             // Make the label indicate if the button is a default button or not
+             drawItem( p, QRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(),
+-                        button->isEnabled(), button->pixmap(), button->text(), -1,
++                        button->isEnabled(), button->pixmap(),
++			_lowerCaseText ? button->text().lower() : button->text(), -1,
+                         &button->colorGroup().buttonText() );
+ 
+ 
+@@ -2745,7 +2748,7 @@ void LipstikStyle::drawControl(ControlEl
+                             		_sharperMenuGradient?_contrast+30:_contrast+3, Draw_Top|Draw_Bottom|Is_Horizontal);
+ 		    }
+     		    p->setPen(cg.highlightedText() );
+-        	    p->drawText(r, text_flags, mi->text());
++        	    p->drawText(r, text_flags, _lowerCaseText ? mi->text().lower() : mi->text());
+             	} else {
+             	    if (down) {
+                 	drawPrimitive(PE_ButtonTool, p, r, cg, flags|Style_Down, opt);
+@@ -2753,11 +2756,11 @@ void LipstikStyle::drawControl(ControlEl
+                 	drawPrimitive(PE_ButtonTool, p, r, cg, flags, opt);
+             	    }
+     		    p->setPen(cg.buttonText() );
+-        	    p->drawText(r, text_flags, mi->text());
++        	    p->drawText(r, text_flags, _lowerCaseText ? mi->text().lower() : mi->text());
+                 }
+ 	    } else {
+     		    p->setPen(cg.buttonText() );
+-        	    p->drawText(r, text_flags, mi->text());
++        	    p->drawText(r, text_flags, _lowerCaseText ? mi->text().lower() : mi->text());
+ 	    }
+             break;
+         }
+@@ -2935,7 +2938,7 @@ void LipstikStyle::drawControl(ControlEl
+             }
+             else {
+                 // The menu item doesn't draw it's own label
+-                QString s = mi->text();
++                QString s = _lowerCaseText ? mi->text().lower() : mi->text();
+                 // Does the menu item have a text label?
+                 if ( !s.isNull() ) {
+                     int t = s.find( '\t' );
+--- lipstik-2.1-orig/style/lipstik.h	2005-12-09 19:45:48.000000000 +0300
++++ lipstik-2.1/style/lipstik.h	2006-01-02 20:21:20.000000000 +0300
+@@ -290,6 +290,7 @@ private:
+     bool _customOverHighlightColor;
+     bool _customFocusHighlightColor;
+     bool _customCheckMarkColor;
++    bool _lowerCaseText;
+ 
+     bool _drawStatusBarFrame;
+     bool _paintGroove;
diff --git a/x11-themes/lipstik/lipstik-2.1.ebuild b/x11-themes/lipstik/lipstik-2.1.ebuild
new file mode 100644
index 000000000000..c382c910d0a8
--- /dev/null
+++ b/x11-themes/lipstik/lipstik-2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2006 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.1 2006/01/02 17:45:58 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
+}