* bump, bug #122157

Package-Manager: portage-2.1_pre4-r1

5 files changed, 193 insertions, 12 deletions

diff --git a/x11-themes/lipstik/ChangeLog b/x11-themes/lipstik/ChangeLog
index 8f3fbcac8f28..f1c23335e4f0 100644
--- a/x11-themes/lipstik/ChangeLog
+++ b/x11-themes/lipstik/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2006/01/11 20:02:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/lipstik/ChangeLog,v 1.9 2006/02/12 15:44:24 voxus Exp $
+
+  12 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +lipstik-2.2.ebuild,
+  +files/lipstik-2.2-lower_case.patch:
+  Version bump, closing bug #122157.
 
   11 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> lipstik-2.1.ebuild:
   Keyworded ~sparc
diff --git a/x11-themes/lipstik/Manifest b/x11-themes/lipstik/Manifest
index fea40c4fe2d7..804f10ecfef4 100644
--- a/x11-themes/lipstik/Manifest
+++ b/x11-themes/lipstik/Manifest
@@ -1,20 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8a2c7faa3cae46a8935cd476aa6748d0 ChangeLog 1215
+MD5 5cfad7ac46530f9be02e63e2bdbf4b20 ChangeLog 1364
+RMD160 095ae939d75225c0b942742527527428ceabab31 ChangeLog 1364
+SHA256 64b63546d4aac792386e291d8241665d7b8dbcd60258e171db677c4c0dbe610b ChangeLog 1364
 MD5 35e6e2ded39053bad610a636e8317598 files/digest-lipstik-1.3 70
+RMD160 6eb7fec4da6133cf1ed23c5c1b0ec0ac76aa7da1 files/digest-lipstik-1.3 70
+SHA256 fc24d9eb4798057545b159db6f4e930e29fdfd4767e976b84f029db3331da6e6 files/digest-lipstik-1.3 70
 MD5 35e6e2ded39053bad610a636e8317598 files/digest-lipstik-1.3-r1 70
+RMD160 6eb7fec4da6133cf1ed23c5c1b0ec0ac76aa7da1 files/digest-lipstik-1.3-r1 70
+SHA256 fc24d9eb4798057545b159db6f4e930e29fdfd4767e976b84f029db3331da6e6 files/digest-lipstik-1.3-r1 70
 MD5 60788c7643a566613d15991717991696 files/digest-lipstik-2.1 70
+RMD160 aaa49643cc688b6e334c7062d1df03214d595fc5 files/digest-lipstik-2.1 70
+SHA256 6912ed20d35401b89a7699125de3d60fd3ef43593a0d2fc994936b76ed9a5357 files/digest-lipstik-2.1 70
+MD5 1661e18f16281a0b157122c1149e3c75 files/digest-lipstik-2.2 256
+RMD160 ea9fc68e80975fdc7b92122b2207e5d7452d4a00 files/digest-lipstik-2.2 256
+SHA256 0be8c932df2638aae7e64fb218da9deea6463e25ba0e27abb398d1c88139a0d2 files/digest-lipstik-2.2 256
 MD5 9615bd01c86a9ebbaa856e83c1d6da9b files/lipstik-1.3-lower_case.patch 5829
+RMD160 b6749e6416fc3c5198e6360ad53d6254d9ecd7f1 files/lipstik-1.3-lower_case.patch 5829
+SHA256 12e2f4100b82ecbbcaa9588e4f41ed741f930cc2ab867ca6527759d00f0acf7e files/lipstik-1.3-lower_case.patch 5829
 MD5 8e06a9e9a93fce00fb2fc37515cec71f files/lipstik-2.1-lower_case.patch 6361
+RMD160 079bbee24768bd5b383bb32e00f21c99d470fbf4 files/lipstik-2.1-lower_case.patch 6361
+SHA256 1e2b2e2c3fbc28f97770e0b7ce571382634857d846dbb1f1e4a236caa61a2c08 files/lipstik-2.1-lower_case.patch 6361
+MD5 b3e7683f98fdfded8da0b8f18b6e7bf0 files/lipstik-2.2-lower_case.patch 6365
+RMD160 a10db10f1a49c5445512bb994ee3d28664512aab files/lipstik-2.2-lower_case.patch 6365
+SHA256 66660cf1bfa9b4653f3c7d5a4a3a09b5955f1e169f0a21fb0e53b6b1a9f4461a files/lipstik-2.2-lower_case.patch 6365
 MD5 12b9623b26efa9203bc5cad640a1598a lipstik-1.3-r1.ebuild 650
+RMD160 e2f67c7dd8d477a06f412a7d260dfdd46df22991 lipstik-1.3-r1.ebuild 650
+SHA256 f3d7b4b7378210637209a6e41276e09430d15ac71701b063a5e7ea7799d0226d lipstik-1.3-r1.ebuild 650
 MD5 8c5c7c8a8d30a1b08c064d3c4868d835 lipstik-1.3.ebuild 560
+RMD160 2038a0879ee011168bd0c8bd4e252f83e8ee0b12 lipstik-1.3.ebuild 560
+SHA256 97cc4b9a81ee529f4fae36f14ebb57903b9ee77db59457f4ec03b2b7b99983b9 lipstik-1.3.ebuild 560
 MD5 0001ad99d838ab29710b72e2345d7508 lipstik-2.1.ebuild 659
+RMD160 2107d168bd28ad8d3b2a294b5fddfc8defd50dc0 lipstik-2.1.ebuild 659
+SHA256 3273a5fdc8e44362816661aeff36b7f0618ec74b90717fb2abc0eda850638993 lipstik-2.1.ebuild 659
+MD5 2146378e031e8625e73dce497de34bab lipstik-2.2.ebuild 656
+RMD160 7c4ffa063e7c91811909a5b600174f0a1aa45ea4 lipstik-2.2.ebuild 656
+SHA256 96d5bbc99f488577f21defec5152ef5c6677af2754dc13edff605166af50840b lipstik-2.2.ebuild 656
 MD5 cb28be74814f0f6cbf78047995f51226 metadata.xml 233
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDxWRUKRy60XGEcJIRAqzCAKCFShCfp6LYlGls6dKZsHrAunHGtQCdE0mG
-ZmfQMbYs+ZxzD/yoWceTeyg=
-=G6VV
------END PGP SIGNATURE-----
+RMD160 83068ed9d3283c386037fb58a80734a302c8d730 metadata.xml 233
+SHA256 7002aa82083b235bfbe98a8569f90cbfcb5385bbceebf5844a378b7665a70baa metadata.xml 233
diff --git a/x11-themes/lipstik/files/digest-lipstik-2.2 b/x11-themes/lipstik/files/digest-lipstik-2.2
new file mode 100644
index 000000000000..c6a4d3d317ba
--- /dev/null
+++ b/x11-themes/lipstik/files/digest-lipstik-2.2
@@ -0,0 +1,3 @@
+MD5 a4c8d994ef08f450491e9ee9840f3323 18223-lipstik-2.2.tar.bz2 431377
+RMD160 4b03c0a1e5ae3957fe4087f6563b21918de443ea 18223-lipstik-2.2.tar.bz2 431377
+SHA256 f914c3a412ac8058c974b8fd446ab7c09375bf85b316b6f2037501cc288e7236 18223-lipstik-2.2.tar.bz2 431377
diff --git a/x11-themes/lipstik/files/lipstik-2.2-lower_case.patch b/x11-themes/lipstik/files/lipstik-2.2-lower_case.patch
new file mode 100644
index 000000000000..d6c399dac13c
--- /dev/null
+++ b/x11-themes/lipstik/files/lipstik-2.2-lower_case.patch
@@ -0,0 +1,133 @@
+--- style/config/lipstikconf.cpp	2006-02-08 20:35:42.000000000 +0300
++++ style/config/lipstikconf.cpp	2006-02-12 18:34:37.139292536 +0300
+@@ -80,6 +80,7 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+ 	animateProgressBar = new QCheckBox(i18n("Animate progress bars"), generalGrp);
+ 	flatHeaders = new QCheckBox(i18n("Flatten column headers"), generalGrp);
+ 	tickCheckMark = new QCheckBox(i18n("Use a tick for checkmarks"), generalGrp);
++	lowerCaseText = new QCheckBox(i18n("Use lowercased text"), generalGrp);
+ 
+ 	tabLayout->addWidget(generalGrp,0,0,0);
+ 
+@@ -351,6 +352,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);
+ 
+@@ -415,6 +419,7 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+ 	connect(focusHighlightColor, SIGNAL( pressed() ), SLOT( updateChanged() ) );
+ 	connect(customCheckMarkColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ 	connect(checkMarkColor, SIGNAL( pressed() ), SLOT( updateChanged() ) );
++	connect(lowerCaseText, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ 
+ 	//Menu Stripe 
+ 	if ( menuLeftSideBar->isChecked() ) {
+@@ -502,6 +507,7 @@ void LipstikStyleConfig::save()
+ 	s.writeEntry("/lipstikstyle/Settings/focusHighlightColor", QColor(focusHighlightColor->color()).name());
+ 	s.writeEntry("/lipstikstyle/Settings/customCheckMarkColor", customCheckMarkColor->isChecked());
+ 	s.writeEntry("/lipstikstyle/Settings/checkMarkColor", QColor(checkMarkColor->color()).name());
++	s.writeEntry("/lipstikstyle/Settings/lowerCaseText", lowerCaseText->isChecked());
+ }
+ 
+ void LipstikStyleConfig::defaults()
+@@ -540,6 +546,7 @@ void LipstikStyleConfig::defaults()
+ 	focusHighlightColor->setColor("/Qt/KWinPalette/activeBackground");
+ 	customCheckMarkColor->setChecked(false);
+ 	checkMarkColor->setColor("/Qt/KWinPalette/activeBackground");
++	lowerCaseText->setChecked(false);
+ 	//updateChanged would be done by setChecked already
+ }
+ 
+@@ -629,6 +636,7 @@ void LipstikStyleConfig::updateChanged()
+ 	    (checkMarkColor->color() == origCheckMarkColor) &&
+ 	    (scrollBarStyle->currentText() == origScrollBarStyle) &&
+ 	    (scrollBarWidth->currentText() == origScrollBarWidth) &&
++	    (lowerCaseText->isChecked() == origLowerCaseText) &&
+ 	    (sliderStyle->currentText() == origSliderStyle)
+ 	)
+ 	    emit changed(false);
+--- style/config/lipstikconf.h	2006-02-08 12:18:05.000000000 +0300
++++ style/config/lipstikconf.h	2006-02-12 18:32:12.646258816 +0300
+@@ -85,6 +85,7 @@ protected:
+ 	QCheckBox* 	 kickerHighlight;
+ 	QCheckBox* 	 drawTabHighlight;
+ 	QCheckBox* 	 flatStripe;
++	QCheckBox* 	 lowerCaseText;
+ 	QCheckBox* 	 compressedMenus;
+ 	QCheckBox* 	 drawToolBarSeparator;
+ 	QCheckBox* 	 drawToolBarGradient;
+@@ -121,6 +122,7 @@ protected:
+ 	bool       origKickerHighlight;
+ 	bool       origDrawTabHighlight;
+     	bool       origFlatStripe;
++    	bool       origLowerCaseText;
+     	bool       origCompressedMenus;
+ 	bool       origDrawToolBarSeparator;
+ 	bool       origDrawToolBarGradient;
+--- style/lipstik.cpp	2006-02-08 20:35:16.000000000 +0300
++++ style/lipstik.cpp	2006-02-12 18:32:12.648258512 +0300
+@@ -196,6 +196,8 @@ LipstikStyle::LipstikStyle() : KStyle( A
+     _menuSpacing = settings.readNumEntry("/menuSpacing", 5);
+     _toolBarSpacing = settings.readNumEntry("/toolBarSpacing", 0);
+ 
++    _lowerCaseText = settings.readBoolEntry("/lowerCaseText", false);
++
+     _drawStatusBarFrame = settings.readBoolEntry("/drawStatusBarFrame", false);
+     _scrollBarStyle = settings.readEntry("/scrollBarStyle", "WindowsStyleScrollBar");
+     _scrollBarWidth = settings.readEntry("/scrollBarWidth", "Small");
+@@ -2738,7 +2740,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() );
+ 
+ 
+@@ -2791,7 +2794,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);
+@@ -2799,11 +2802,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;
+         }
+@@ -3003,7 +3006,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' );
+--- style/lipstik.h	2006-02-08 12:13:21.000000000 +0300
++++ style/lipstik.h	2006-02-12 18:32:12.649258360 +0300
+@@ -294,6 +294,7 @@ private:
+     bool _customOverHighlightColor;
+     bool _customFocusHighlightColor;
+     bool _customCheckMarkColor;
++    bool _lowerCaseText;
+ 
+     bool _drawStatusBarFrame;
+     bool _paintGroove;
diff --git a/x11-themes/lipstik/lipstik-2.2.ebuild b/x11-themes/lipstik/lipstik-2.2.ebuild
new file mode 100644
index 000000000000..c0587118e6c2
--- /dev/null
+++ b/x11-themes/lipstik/lipstik-2.2.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.2.ebuild,v 1.1 2006/02/12 15:44:24 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 ~sparc ~x86"
+RESTRICT="nomirror ${RESTRICT}"
+
+need-kde 3.3
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S} && epatch ${FILESDIR}/${P}-lower_case.patch
+}