Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 37452
Collapse All | Expand All

(-)kportage-0.6.1/kportage/config/Makefile.am (-1 / +1 lines)
Lines 1-7 Link Here
1
####### kdevelop will overwrite this part!!! (begin)##########
1
####### kdevelop will overwrite this part!!! (begin)##########
2
noinst_LIBRARIES = libconfig.a
2
noinst_LIBRARIES = libconfig.a
3
3
4
INCLUDES = $(all_includes) -I/usr/include/python2.2/
4
INCLUDES = $(all_includes) -I/usr/include/python2.3/
5
5
6
libconfig_a_METASOURCES = AUTO
6
libconfig_a_METASOURCES = AUTO
7
7
(-)kportage-0.6.1/kportage/config/Makefile.in (-1 / +1 lines)
Lines 246-252 Link Here
246
####### kdevelop will overwrite this part!!! (begin)##########
246
####### kdevelop will overwrite this part!!! (begin)##########
247
noinst_LIBRARIES = libconfig.a
247
noinst_LIBRARIES = libconfig.a
248
248
249
INCLUDES = $(all_includes) -I/usr/include/python2.2/
249
INCLUDES = $(all_includes) -I/usr/include/python2.3/
250
250
251
#>- libconfig_a_METASOURCES = AUTO
251
#>- libconfig_a_METASOURCES = AUTO
252
252
(-)kportage-0.6.1/kportage/config/parsemakeconfs.cpp (-1 / +1 lines)
Lines 15-25 Link Here
15
 *                                                                         *
15
 *                                                                         *
16
 ***************************************************************************/
16
 ***************************************************************************/
17
17
18
#include "../portage/portagepython.h"
18
#include "parsemakeconfs.h"
19
#include "parsemakeconfs.h"
19
#include "../portage/packagebase.h"
20
#include "../portage/packagebase.h"
20
#include "../portage/portagemap.h"
21
#include "../portage/portagemap.h"
21
#include "../portage/virtuals.h"
22
#include "../portage/virtuals.h"
22
#include "../portage/portagepython.h"
23
#include <kdebug.h>
23
#include <kdebug.h>
24
#include <qregexp.h>
24
#include <qregexp.h>
25
#include <qfile.h>
25
#include <qfile.h>
(-)kportage-0.6.1/kportage/Makefile.am (-2 / +2 lines)
Lines 4-10 Link Here
4
## INCLUDES were found outside kdevelop specific part
4
## INCLUDES were found outside kdevelop specific part
5
5
6
kportage_SOURCES = portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp ebuildview.ui kportageview.cpp kportage.cpp main.cpp
6
kportage_SOURCES = portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp ebuildview.ui kportageview.cpp kportage.cpp main.cpp
7
kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.2
7
kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.3
8
8
9
SUBDIRS = images portage processes config
9
SUBDIRS = images portage processes config
10
10
Lines 51-57 Link Here
51
METASOURCES = AUTO
51
METASOURCES = AUTO
52
52
53
# the library search path. 
53
# the library search path. 
54
kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.2/config 
54
kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.3/config 
55
55
56
rcdir = $(kde_datadir)/kportage
56
rcdir = $(kde_datadir)/kportage
57
rc_DATA = kportageui.rc
57
rc_DATA = kportageui.rc
(-)kportage-0.6.1/kportage/Makefile.in (-2 / +2 lines)
Lines 249-255 Link Here
249
#>- kportage_SOURCES = portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp ebuildview.ui kportageview.cpp kportage.cpp main.cpp
249
#>- kportage_SOURCES = portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp ebuildview.ui kportageview.cpp kportage.cpp main.cpp
250
#>+ 1
250
#>+ 1
251
kportage_SOURCES=portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp  kportageview.cpp kportage.cpp main.cpp ebuildview.cpp
251
kportage_SOURCES=portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp  kportageview.cpp kportage.cpp main.cpp ebuildview.cpp
252
kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.2
252
kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.3
253
253
254
SUBDIRS = images portage processes config
254
SUBDIRS = images portage processes config
255
255
Lines 283-289 Link Here
283
#>- METASOURCES = AUTO
283
#>- METASOURCES = AUTO
284
284
285
# the library search path. 
285
# the library search path. 
286
kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.2/config 
286
kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.3/config 
287
287
288
rcdir = $(kde_datadir)/kportage
288
rcdir = $(kde_datadir)/kportage
289
rc_DATA = kportageui.rc
289
rc_DATA = kportageui.rc
(-)kportage-0.6.1/kportage/portage/kportagemask.py (-1 / +1 lines)
Lines 1-5 Link Here
1
#!/usr/bin/python
1
#!/usr/bin/python
2
#!/usr/bin/env python2.2
2
#!/usr/bin/env python2.3
3
3
4
import portage, sys
4
import portage, sys
5
5
(-)kportage-0.6.1/kportage/portage/Makefile.am (-3 / +3 lines)
Lines 1-14 Link Here
1
noinst_LIBRARIES = libportage.a
1
noinst_LIBRARIES = libportage.a
2
INCLUDES = $(all_includes) -I/usr/include/python2.2/
2
INCLUDES = $(all_includes) -I/usr/include/python2.3/
3
libportage_a_METASOURCES = AUTO
3
libportage_a_METASOURCES = AUTO
4
4
5
libportage_a_SOURCES = portagemap.cpp packagebase.cpp portagereader.cpp mergedreader.cpp packagedirreader.cpp parseebuild.cpp package.cpp maskprocess.cpp portagepython.cpp
5
libportage_a_SOURCES = portagemap.cpp packagebase.cpp portagereader.cpp mergedreader.cpp packagedirreader.cpp parseebuild.cpp package.cpp maskprocess.cpp portagepython.cpp
6
EXTRA_DIST = portagepython.h portagepython.cpp mapfile.h mergedreader.h mergedreader.cpp packagedirreader.h packagedirreader.cpp parseebuild.h parseebuild.cpp package.cpp package.h portagereader.h portagereader.cpp packagebase.h packagebase.cpp portagemap.h portagemap.cpp maskprocess.cpp maskprocess.h
6
EXTRA_DIST = portagepython.h portagepython.cpp mapfile.h mergedreader.h mergedreader.cpp packagedirreader.h packagedirreader.cpp parseebuild.h parseebuild.cpp package.cpp package.h portagereader.h portagereader.cpp packagebase.h packagebase.cpp portagemap.h portagemap.cpp maskprocess.cpp maskprocess.h
7
7
8
install-data-local:
8
install-data-local:
9
	$(INSTALL_DATA) -D kportage.py /usr/lib/python2.2/site-packages/kportage.py
9
	$(INSTALL_DATA) -D kportage.py /usr/lib/python2.3/site-packages/kportage.py
10
	$(INSTALL_DATA) $(srcdir)/kportagemask.py $(kde_datadir)/kportage/kportagemask.py
10
	$(INSTALL_DATA) $(srcdir)/kportagemask.py $(kde_datadir)/kportage/kportagemask.py
11
11
12
uninstall-local:
12
uninstall-local:
13
	-rm -f /usr/lib/python2.2/site-packages/kportage.py
13
	-rm -f /usr/lib/python2.3/site-packages/kportage.py
14
	-rm -f $(kde_datadir)/kportage/kportagemask.py
14
	-rm -f $(kde_datadir)/kportage/kportagemask.py
(-)kportage-0.6.1/kportage/portage/Makefile.in (-5 / +5 lines)
Lines 243-249 Link Here
243
x_includes = @x_includes@
243
x_includes = @x_includes@
244
x_libraries = @x_libraries@
244
x_libraries = @x_libraries@
245
noinst_LIBRARIES = libportage.a
245
noinst_LIBRARIES = libportage.a
246
INCLUDES = $(all_includes) -I/usr/include/python2.2/
246
INCLUDES = $(all_includes) -I/usr/include/python2.3/
247
#>- libportage_a_METASOURCES = AUTO
247
#>- libportage_a_METASOURCES = AUTO
248
248
249
libportage_a_SOURCES = portagemap.cpp packagebase.cpp portagereader.cpp mergedreader.cpp packagedirreader.cpp parseebuild.cpp package.cpp maskprocess.cpp portagepython.cpp
249
libportage_a_SOURCES = portagemap.cpp packagebase.cpp portagereader.cpp mergedreader.cpp packagedirreader.cpp parseebuild.cpp package.cpp maskprocess.cpp portagepython.cpp
Lines 553-569 Link Here
553
553
554
554
555
install-data-local:
555
install-data-local:
556
#>- 	$(INSTALL_DATA) -D kportage.py /usr/lib/python2.2/site-packages/kportage.py
556
#>- 	$(INSTALL_DATA) -D kportage.py /usr/lib/python2.3/site-packages/kportage.py
557
#>+ 1
557
#>+ 1
558
	$(INSTALL_DATA) -D kportage.py $(DESTDIR)/usr/lib/python2.2/site-packages/kportage.py
558
	$(INSTALL_DATA) -D kportage.py $(DESTDIR)/usr/lib/python2.3/site-packages/kportage.py
559
#>- 	$(INSTALL_DATA) $(srcdir)/kportagemask.py $(kde_datadir)/kportage/kportagemask.py
559
#>- 	$(INSTALL_DATA) $(srcdir)/kportagemask.py $(kde_datadir)/kportage/kportagemask.py
560
#>+ 1
560
#>+ 1
561
	$(INSTALL_DATA) $(srcdir)/kportagemask.py $(DESTDIR)$(kde_datadir)/kportage/kportagemask.py
561
	$(INSTALL_DATA) $(srcdir)/kportagemask.py $(DESTDIR)$(kde_datadir)/kportage/kportagemask.py
562
562
563
uninstall-local:
563
uninstall-local:
564
#>- 	-rm -f /usr/lib/python2.2/site-packages/kportage.py
564
#>- 	-rm -f /usr/lib/python2.3/site-packages/kportage.py
565
#>+ 1
565
#>+ 1
566
	-rm -f $(DESTDIR)/usr/lib/python2.2/site-packages/kportage.py
566
	-rm -f $(DESTDIR)/usr/lib/python2.3/site-packages/kportage.py
567
#>- 	-rm -f $(kde_datadir)/kportage/kportagemask.py
567
#>- 	-rm -f $(kde_datadir)/kportage/kportagemask.py
568
#>+ 1
568
#>+ 1
569
	-rm -f $(DESTDIR)$(kde_datadir)/kportage/kportagemask.py
569
	-rm -f $(DESTDIR)$(kde_datadir)/kportage/kportagemask.py
(-)kportage-0.6.1/kportage/portage/portagemap.cpp (-1 / +1 lines)
Lines 15-20 Link Here
15
 *                                                                         *
15
 *                                                                         *
16
 ***************************************************************************/
16
 ***************************************************************************/
17
17
18
#include "portagepython.h"
18
#include <qdir.h>
19
#include <qdir.h>
19
#include <qstring.h>
20
#include <qstring.h>
20
#include <qtimer.h>
21
#include <qtimer.h>
Lines 31-37 Link Here
31
#include "packagedirreader.h"
32
#include "packagedirreader.h"
32
#include "mapfile.h"
33
#include "mapfile.h"
33
#include "maskprocess.h"
34
#include "maskprocess.h"
34
#include "portagepython.h"
35
35
36
PortageMap *PortageMap::s_instance=0L;
36
PortageMap *PortageMap::s_instance=0L;
37
37
(-)kportage-0.6.1/kportage/portage/portagepython.h (-1 / +1 lines)
Lines 18-25 Link Here
18
#ifndef _PORTAGEPYTHON_H_
18
#ifndef _PORTAGEPYTHON_H_
19
#define _PORTAGEPYTHON_H_
19
#define _PORTAGEPYTHON_H_
20
20
21
#include <qobject.h>
22
#include <Python.h>
21
#include <Python.h>
22
#include <qobject.h>
23
#include <qstring.h>
23
#include <qstring.h>
24
#include "portagemap.h"
24
#include "portagemap.h"
25
25
(-)kportage-0.6.1/kportage/processes/Makefile.am (-1 / +1 lines)
Lines 1-7 Link Here
1
####### kdevelop will overwrite this part!!! (begin)##########
1
####### kdevelop will overwrite this part!!! (begin)##########
2
noinst_LIBRARIES = libprocesses.a
2
noinst_LIBRARIES = libprocesses.a
3
#libprocesses_a_LIBADD = $(top_builddir)/kportage/portage/libpython.a
3
#libprocesses_a_LIBADD = $(top_builddir)/kportage/portage/libpython.a
4
INCLUDES = $(all_includes) -I/usr/include/python2.2
4
INCLUDES = $(all_includes) -I/usr/include/python2.3
5
5
6
libprocesses_a_METASOURCES = AUTO
6
libprocesses_a_METASOURCES = AUTO
7
7
(-)kportage-0.6.1/kportage/processes/Makefile.in (-1 / +1 lines)
Lines 246-252 Link Here
246
####### kdevelop will overwrite this part!!! (begin)##########
246
####### kdevelop will overwrite this part!!! (begin)##########
247
noinst_LIBRARIES = libprocesses.a
247
noinst_LIBRARIES = libprocesses.a
248
#libprocesses_a_LIBADD = $(top_builddir)/kportage/portage/libpython.a
248
#libprocesses_a_LIBADD = $(top_builddir)/kportage/portage/libpython.a
249
INCLUDES = $(all_includes) -I/usr/include/python2.2
249
INCLUDES = $(all_includes) -I/usr/include/python2.3
250
250
251
#>- libprocesses_a_METASOURCES = AUTO
251
#>- libprocesses_a_METASOURCES = AUTO
252
252
(-)kportage-0.6.1/kportage/processes/processes.cpp (-1 / +1 lines)
Lines 15-20 Link Here
15
 *                                                                         *
15
 *                                                                         *
16
 ***************************************************************************/
16
 ***************************************************************************/
17
17
18
#include "../portage/portagepython.h"
18
#include "processes.h"
19
#include "processes.h"
19
#include "procemerge.h"
20
#include "procemerge.h"
20
#include "procrsync.h"
21
#include "procrsync.h"
Lines 23-29 Link Here
23
#include "procinject.h"
24
#include "procinject.h"
24
#include "procclean.h"
25
#include "procclean.h"
25
#include "../kportageview.h"
26
#include "../kportageview.h"
26
#include "../portage/portagepython.h"
27
27
28
#include <klocale.h>
28
#include <klocale.h>
29
#include <kdebug.h>
29
#include <kdebug.h>

Return to bug 37452