diff options
author | 2006-04-13 05:06:31 +0000 | |
---|---|---|
committer | 2006-04-13 05:06:31 +0000 | |
commit | 7d1e2e820fe3f0270964d6ef0170007452c02ca1 (patch) | |
tree | 2c91b82ffa6b22339b4db7ea9572bd4894a4a4fc /x11-libs | |
parent | version bump (diff) | |
download | gentoo-2-7d1e2e820fe3f0270964d6ef0170007452c02ca1.tar.gz gentoo-2-7d1e2e820fe3f0270964d6ef0170007452c02ca1.tar.bz2 gentoo-2-7d1e2e820fe3f0270964d6ef0170007452c02ca1.zip |
remove obsolete versions
(Portage version: 2.0.54)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/wxGTK/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r2 | 1 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r3 | 1 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.5.3 | 1 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.6.0-r1 | 2 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch | 32 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch | 208 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild | 149 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild | 150 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-2.5.3.ebuild | 151 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild | 77 |
11 files changed, 7 insertions, 773 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index ecec637123ab..95fafe155672 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.117 2006/04/01 06:27:00 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.118 2006/04/13 05:06:31 mrness Exp $ + + 13 Apr 2006; Alin Nastac <mrness@gentoo.org> + -files/wxGTK-2.4.1-wxpython1.patch, -files/wxGTK-2.4.1-wxpython2.patch, + -wxGTK-2.4.2-r2.ebuild, -wxGTK-2.4.2-r3.ebuild, -wxGTK-2.5.3.ebuild, + -wxGTK-2.6.0-r1.ebuild: + Remove obsolete versions. 01 Apr 2006; Alec Warner <antarus@gentoo.org> wxGTK-2.6.2-r1.ebuild, -wxGTK-2.6.2-r2.ebuild: diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r2 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r2 deleted file mode 100644 index 81bb0e836695..000000000000 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r3 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r3 deleted file mode 100644 index 81bb0e836695..000000000000 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.5.3 b/x11-libs/wxGTK/files/digest-wxGTK-2.5.3 deleted file mode 100644 index c3befefec80c..000000000000 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.5.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 eccd8fee99f7031b380b7ce026ea78be wxGTK-2.5.3.tar.bz2 6783651 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.0-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.0-r1 deleted file mode 100644 index dfba0bbdf465..000000000000 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.0-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 93359c101085770ff6c8aae42d25adcf wxWidgets-2.6.0.tar.bz2 13036418 -MD5 3e137bdfa2406e6c8687d0b650e8b47a wxWidgets-2.6.0-HTML.tar.gz 1429436 diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch deleted file mode 100644 index 273b45bec201..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur wx/chkconf.h ../../wxPythonSrc-2.4.1.2/include/wx/chkconf.h ---- wxGTK-2.4.1/include/wx/chkconf.h 2003-06-08 09:13:10.000000000 +0100 -+++ wxGTK-2.4.1/include/wx/chkconf.h 2003-06-16 21:46:45.000000000 +0100 -@@ -772,6 +772,17 @@ - # endif - #endif /* wxUSE_FILESYSTEM */ - -+#if wxUSE_FS_INET -+# if !wxUSE_PROTOCOL -+# ifdef wxABORT_ON_CONFIG_ERROR -+# error "wxUSE_FS_INET requires wxUSE_PROTOCOL" -+# else -+# undef wxUSE_PROTOCOL -+# define wxUSE_PROTOCOL 1 -+# endif -+# endif -+#endif /* wxUSE_FS_INET */ -+ - #if wxUSE_STOPWATCH || wxUSE_DATETIME - # if !wxUSE_LONGLONG - # ifdef wxABORT_ON_CONFIG_ERROR -diff -ur wx/menuitem.h ../../wxPythonSrc-2.4.1.2/include/wx/menuitem.h ---- wxGTK-2.4.1/include/wx/menuitem.h 2003-06-08 09:13:11.000000000 +0100 -+++ wxGTK-2.4.1/include/wx/menuitem.h 2003-06-11 00:48:45.000000000 +0100 -@@ -49,6 +49,7 @@ - - // the menu we're in - wxMenu *GetMenu() const { return m_parentMenu; } -+ void SetMenu(wxMenu* menu) { m_parentMenu = menu; } - - // get/set id - void SetId(int id) { m_id = id; } diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch deleted file mode 100644 index 3f38d913d1bd..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff -ru ./common/filefn.cpp ../../wxPythonSrc-2.4.1.2/src/common/filefn.cpp ---- wxGTK-2.4.1/src/common/filefn.cpp 2003-06-08 09:13:13.000000000 +0100 -+++ wxGTK-2.4.1/src/common/filefn.cpp 2003-06-11 21:20:15.000000000 +0100 -@@ -1595,6 +1595,8 @@ - wxChar buf[256]; - GetWindowsDirectory(buf, 256); - return wxString(buf); -+#elif defined(__WXMAC__) -+ return wxMacFindFolder(kOnSystemDisk, 'macs', false); - #else - return wxEmptyString; - #endif -diff -ru ./common/log.cpp ../../wxPythonSrc-2.4.1.2/src/common/log.cpp ---- wxGTK-2.4.1/src/common/log.cpp 2003-06-08 09:13:14.000000000 +0100 -+++ wxGTK-2.4.1/src/common/log.cpp 2003-06-16 21:46:45.000000000 +0100 -@@ -114,13 +114,24 @@ - // macros and not all compilers inline vararg functions. - // ---------------------------------------------------------------------------- - -+// wrapper for wxVsnprintf(s_szBuf) which always NULL-terminates it -+static inline void PrintfInLogBug(const wxChar *szFormat, va_list argptr) -+{ -+ if ( wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr) < 0 ) -+ { -+ // must NUL-terminate it manually -+ s_szBuf[s_szBufSize - 1] = _T('\0'); -+ } -+ //else: NUL-terminated by vsnprintf() -+} -+ - // generic log function - void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr) - { - if ( IsLoggingEnabled() ) { - wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); - -- wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr); -+ PrintfInLogBug(szFormat, argptr); - - wxLog::OnLog(level, s_szBuf, time(NULL)); - } -@@ -140,11 +151,12 @@ - if ( IsLoggingEnabled() ) { \ - wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); \ - \ -- wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr); \ -+ PrintfInLogBug(szFormat, argptr); \ - \ - wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \ - } \ - } \ -+ \ - void wxLog##level(const wxChar *szFormat, ...) \ - { \ - va_list argptr; \ -diff -ru ./common/menucmn.cpp ../../wxPythonSrc-2.4.1.2/src/common/menucmn.cpp ---- wxGTK-2.4.1/src/common/menucmn.cpp 2003-06-08 09:13:14.000000000 +0100 -+++ wxGTK-2.4.1/src/common/menucmn.cpp 2003-06-11 00:48:46.000000000 +0100 -@@ -332,6 +332,7 @@ - wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") ); - - m_items.Append(item); -+ item->SetMenu((wxMenu*)this); - if ( item->IsSubMenu() ) - { - AddSubMenu(item->GetSubMenu()); -@@ -365,6 +366,7 @@ - wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") ); - - m_items.Insert(node, item); -+ item->SetMenu((wxMenu*)this); - if ( item->IsSubMenu() ) - { - AddSubMenu(item->GetSubMenu()); -@@ -393,6 +395,7 @@ - m_items.DeleteNode(node); - - // item isn't attached to anything any more -+ item->SetMenu((wxMenu *)NULL); - wxMenu *submenu = item->GetSubMenu(); - if ( submenu ) - { -diff -ru ./common/regex.cpp ../../wxPythonSrc-2.4.1.2/src/common/regex.cpp ---- wxGTK-2.4.1/src/common/regex.cpp 2003-06-08 09:13:14.000000000 +0100 -+++ wxGTK-2.4.1/src/common/regex.cpp 2003-06-16 21:46:45.000000000 +0100 -@@ -204,21 +204,24 @@ - m_nMatches = 1; - - // and some more for bracketed subexperessions -- const wxChar *cptr = expr.c_str(); -- wxChar prev = _T('\0'); -- while ( *cptr != _T('\0') ) -+ for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ ) - { -- // is this a subexpr start, i.e. "(" for extended regex or -- // "\(" for a basic one? -- if ( *cptr == _T('(') && -- (flags & wxRE_BASIC ? prev == _T('\\') -- : prev != _T('\\')) ) -+ if ( *cptr == _T('\\') ) - { -+ // in basic RE syntax groups are inside \(...\) -+ if ( *++cptr == _T('(') && (flags & wxRE_BASIC) ) -+ { -+ m_nMatches++; -+ } -+ } -+ else if ( *cptr == _T('(') && !(flags & wxRE_BASIC) ) -+ { -+ // we know that the previous character is not an unquoted -+ // backslash because it would have been eaten above, so we -+ // have a bar '(' and this indicates a group start for the -+ // extended syntax - m_nMatches++; - } -- -- prev = *cptr; -- cptr++; - } - } - -diff -ru ./gtk/timer.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/timer.cpp ---- wxGTK-2.4.1/src/gtk/timer.cpp 2003-06-08 09:13:21.000000000 +0100 -+++ wxGTK-2.4.1/src/gtk/timer.cpp 2003-06-17 18:23:24.000000000 +0100 -@@ -41,12 +41,7 @@ - gdk_threads_leave(); - - if ( timer->IsOneShot() ) -- { -- // This sets m_tag to -1 -- timer->Stop(); -- - return FALSE; -- } - - return TRUE; - } -diff -ru ./gtk/window.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/window.cpp ---- wxGTK-2.4.1/src/gtk/window.cpp 2003-06-08 09:13:22.000000000 +0100 -+++ wxGTK-2.4.1/src/gtk/window.cpp 2003-06-19 20:14:52.000000000 +0100 -@@ -3629,12 +3629,10 @@ - wxapp_install_idle_handler(); - - wxRect myRect(0,0,0,0); -- if (m_wxwindow) -+ if (m_wxwindow && rect) -+ { - myRect.SetSize(wxSize( m_wxwindow->allocation.width, - m_wxwindow->allocation.height)); -- -- if (rect) -- { - myRect.Intersect(*rect); - if (!myRect.width || !myRect.height) - // nothing to do, rectangle is empty -@@ -4072,7 +4070,7 @@ - { - #ifdef __WXGTK20__ - pango_font_description_free( style->font_desc ); -- pango_font_description_copy( m_font.GetNativeFontInfo()->description ); -+ style->font_desc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); - #else - gdk_font_unref( style->font ); - style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) ); -diff -ru ./html/htmlpars.cpp ../../wxPythonSrc-2.4.1.2/src/html/htmlpars.cpp ---- wxGTK-2.4.1/src/html/htmlpars.cpp 2003-06-08 09:13:16.000000000 +0100 -+++ wxGTK-2.4.1/src/html/htmlpars.cpp 2003-06-11 00:34:25.000000000 +0100 -@@ -872,7 +872,7 @@ - } - - if (tag.HasParam(_T("HTTP-EQUIV")) && -- tag.GetParam(_T("HTTP-EQUIV")) == _T("Content-Type") && -+ tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), FALSE) && - tag.HasParam(_T("CONTENT"))) - { - wxString content = tag.GetParam(_T("CONTENT")); -diff -ru ./html/m_layout.cpp ../../wxPythonSrc-2.4.1.2/src/html/m_layout.cpp ---- wxGTK-2.4.1/src/html/m_layout.cpp 2003-06-08 09:13:16.000000000 +0100 -+++ wxGTK-2.4.1/src/html/m_layout.cpp 2003-06-09 23:25:08.000000000 +0100 -@@ -80,7 +80,7 @@ - }; - - // Comparison routine for bsearch into an int* array of pagebreaks. --static int integer_compare(void const* i0, void const* i1) -+extern "C" int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1) - { - return *(int*)i0 - *(int*)i1; - } -@@ -130,7 +130,7 @@ - // zero plus one element for each page. - int* where = (int*) bsearch(&total_height, known_pagebreaks, - 1 + number_of_pages, sizeof(int), -- integer_compare); -+ wxInteger_compare); - // Add a pagebreak only if there isn't one already set here. - if(NULL != where) - { -diff -ru ./make.env.in ../../wxPythonSrc-2.4.1.2/src/make.env.in ---- wxGTK-2.4.1/src/make.env.in 2003-06-08 09:13:13.000000000 +0100 -+++ wxGTK-2.4.1/src/make.env.in 2003-06-17 00:47:18.000000000 +0100 -@@ -14,6 +14,7 @@ - # see comment near LDFLAGS at the end of file - EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@ - OPENGLLIBS = @OPENGL_LIBS@ -+LDFLAGS_GL = @LDFLAGS_GL@ - LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} - - TOOLKIT = @TOOLKIT@ diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild deleted file mode 100644 index 8264f8860683..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild,v 1.9 2005/05/02 20:04:10 pythonhead Exp $ - -inherit flag-o-matic eutils gnuconfig - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="http://www.wxwidgets.org/" -SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" - -LICENSE="wxWinLL-3" -SLOT="2.4" -KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa ppc64" -IUSE="debug wxgtk1 gtk2 odbc opengl unicode" - -RDEPEND="virtual/x11 - sys-libs/zlib - media-libs/libpng - media-libs/jpeg - media-libs/tiff - !unicode? ( odbc? ( dev-db/unixODBC ) ) - opengl? ( virtual/opengl ) - gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) - wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" -DEPEND="${RDEPEND} - gtk2? ( dev-util/pkgconfig )" - -# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets -# has its own implementation of it -# Note 2: PCX support is enabled if the correct libraries are detected. -# There is no USE flag for this. - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch || \ - die "Failed to patch menu.cpp" - # fix xml contrib makefile problems - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch - # disable contrib/src/animate - EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch - use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch - gnuconfig_update -} - -pkg_setup() { - einfo "New in >=wxGTK-2.4.2-r2:" - einfo "------------------------" - einfo "You can now have gtk, gtk2 and unicode versions installed" - einfo "simultaneously. Use wxgtk1 if you want a gtk1 lib." - einfo "Put gtk2 and unicode in your USE flags to get those" - einfo "additional versions." - einfo "NOTE:" - einfo "You can also get debug versions of any of those, but not debug" - einfo "and normal installed at the same time." - if use unicode; then - ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" - fi - if ! use wxgtk1 && ! use gtk2; then - die "You must have at least gtk2 or wxgtk1 in your USE" - fi -} - -src_compile() { - local myconf - export LANG='C' - filter-flags -fvisibility-inlines-hidden - myconf="${myconf} `use_with opengl`" - myconf="${myconf} --with-gtk" - myconf="${myconf} `use_enable debug`" - - if use wxgtk1 ; then - mkdir build_gtk - einfo "Building gtk version" - cd build_gtk - ../configure ${myconf} `use_with odbc`\ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake || die "make gtk failed" - cd contrib/src - emake || die "make gtk contrib failed" - fi - cd ${S} - - if use gtk2 ; then - myconf="${myconf} --enable-gtk2" - einfo "Building gtk2 version" - mkdir build_gtk2 - cd build_gtk2 - ../configure ${myconf} `use_with odbc` \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake || die "make gtk2 failed" - cd contrib/src - emake || die "make gtk2 contrib failed" - - cd ${S} - - if use unicode ; then - myconf="${myconf} --enable-unicode" - einfo "Building unicode version" - mkdir build_unicode - cd build_unicode - ../configure ${myconf} \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - - emake || die "make unicode failed" - - cd contrib/src - emake || die "make unicode contrib failed" - fi - fi -} - -src_install() { - if [ -e ${S}/build_gtk ] ; then - cd ${S}/build_gtk - einstall || die "install gtk failed" - cd contrib/src - einstall || die "install gtk contrib failed" - fi - - if [ -e ${S}/build_gtk2 ] ; then - cd ${S}/build_gtk2 - einstall || die "install gtk2 failed" - cd contrib/src - einstall || die "install gtk2 contrib failed" - fi - - if [ -e ${S}/build_unicode ] ; then - cd ${S}/build_unicode - einstall || die "install unicode failed" - cd contrib/src - einstall || die "install unicode contrib failed" - fi - - # twp 20040830 wxGTK-2.4.2 forgets to install htmlproc.h; copy it manually - insinto /usr/include/wx/html - doins ${S}/include/wx/html/htmlproc.h - - cd ${S} - dodoc *.txt -} diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild deleted file mode 100644 index df846687b138..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.17 2005/07/07 03:41:24 vapier Exp $ - -inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="http://www.wxwidgets.org/" -SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" - -LICENSE="wxWinLL-3" -SLOT="2.4" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="debug wxgtk1 gtk2 odbc opengl unicode" - -RDEPEND="virtual/x11 - sys-libs/zlib - media-libs/libpng - media-libs/jpeg - media-libs/tiff - !unicode? ( odbc? ( dev-db/unixODBC ) ) - opengl? ( virtual/opengl ) - gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) - wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" -DEPEND="${RDEPEND} - gtk2? ( dev-util/pkgconfig )" - -# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets -# has its own implementation of it -# Note 2: PCX support is enabled if the correct libraries are detected. -# There is no USE flag for this. - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch || \ - die "Failed to patch menu.cpp" - # fix xml contrib makefile problems - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch - # disable contrib/src/animate - EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch - use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch - gnuconfig_update -} - -pkg_setup() { - einfo "New in >=wxGTK-2.4.2-r2:" - einfo "------------------------" - einfo "You can now have gtk, gtk2 and unicode versions installed" - einfo "simultaneously. Use wxgtk1 if you would like a gtk1 lib." - einfo "Put gtk2 and unicode in your USE flags to get those" - einfo "additional versions." - einfo "NOTE:" - einfo "You can also get debug versions of any of those, but not debug" - einfo "and normal installed at the same time." - if use unicode; then - ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" - fi - if ! use wxgtk1 && ! use gtk2; then - die "You must have at least gtk2 or wxgtk1 in your USE" - fi -} - -src_compile() { - local myconf - export LANG='C' - filter-flags -fvisibility-inlines-hidden - myconf="${myconf} `use_with opengl`" - myconf="${myconf} --with-gtk" - myconf="${myconf} `use_enable debug`" - myconf="${myconf} --libdir=/usr/$(get_libdir)" - - if use wxgtk1 ; then - mkdir build_gtk - einfo "Building gtk version" - cd build_gtk - ../configure ${myconf} `use_with odbc`\ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed" - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed" - fi - cd ${S} - - if use gtk2 ; then - myconf="${myconf} --enable-gtk2" - einfo "Building gtk2 version" - mkdir build_gtk2 - cd build_gtk2 - ../configure ${myconf} `use_with odbc` \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed" - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed" - - cd ${S} - - if use unicode ; then - myconf="${myconf} --enable-unicode" - einfo "Building unicode version" - mkdir build_unicode - cd build_unicode - ../configure ${myconf} \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed" - - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed" - fi - fi -} - -src_install() { - if [ -e ${S}/build_gtk ] ; then - cd ${S}/build_gtk - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed" - fi - - if [ -e ${S}/build_gtk2 ] ; then - cd ${S}/build_gtk2 - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed" - fi - - if [ -e ${S}/build_unicode ] ; then - cd ${S}/build_unicode - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed" - fi - - # twp 20040830 wxGTK-2.4.2 forgets to install htmlproc.h; copy it manually - insinto /usr/include/wx/html - doins ${S}/include/wx/html/htmlproc.h - - cd ${S} - dodoc *.txt -} diff --git a/x11-libs/wxGTK/wxGTK-2.5.3.ebuild b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild deleted file mode 100644 index 88681c5ed461..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.5.3.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.5.3.ebuild,v 1.7 2005/05/02 17:57:03 pythonhead Exp $ - -inherit eutils gnuconfig multilib toolchain-funcs - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="http://www.wxwidgets.org/" -SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" - -LICENSE="wxWinLL-3" -SLOT="2.5" -KEYWORDS="~x86" -IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode" - -RDEPEND="virtual/x11 - sys-libs/zlib - media-libs/libpng - media-libs/jpeg - media-libs/tiff - !unicode? ( odbc? ( dev-db/unixODBC ) ) - opengl? ( virtual/opengl ) - gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) - !no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" -DEPEND="${RDEPEND} - gtk2? ( dev-util/pkgconfig ) - sys-apps/sed" - -# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets -# has its own implementation of it -# Note 2: PCX support is enabled if the correct libraries are detected. -# There is no USE flag for this. - -pkg_setup() { - einfo "New in >=wxGTK-2.4.2-r2:" - einfo "------------------------" - einfo "You can now have gtk, gtk2(ansi) and gtk2(unicode) versions installed" - einfo "simultaneously. gtk is installed by default because it is" - einfo "more stable than gtk2. Use no_wxgtk1 if you don't want it." - einfo "Put gtk2 and unicode in your USE flags to get those" - einfo "additional versions if desired." - einfo "NOTE:" - einfo "You can also get debug versions of any of those, but not debug" - einfo "and normal installed at the same time." - if use unicode; then - ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" - fi - if use no_wxgtk1 && ! use gtk2; then - die "You must have at least gtk2 or -no_wxgtk1 in your USE" - fi -} - -src_compile() { - gnuconfig_update - - local myconf - export LANG='C' - sed -i "s/-O2//g" configure || die "sed configure failed" - - myconf="${myconf} `use_with opengl`" - myconf="${myconf} --with-gtk" - myconf="${myconf} `use_enable debug`" - myconf="${myconf} --libdir=/usr/$(get_libdir)" - - if ! use no_wxgtk1 ; then - mkdir build_gtk - einfo "Building gtk version" - cd build_gtk - ../configure ${myconf} --disable-gtk2 `use_with odbc`\ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed" - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed" - fi - cd ${S} - - if use gtk2 ; then - myconf="${myconf} --enable-gtk2" - einfo "Building gtk2 version" - mkdir build_gtk2 - cd build_gtk2 - ../configure ${myconf} \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed" - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed" - - cd ${S} - - if use unicode ; then - myconf="${myconf} --enable-unicode" - einfo "Building unicode version" - mkdir build_unicode - cd build_unicode - ../configure ${myconf} \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed" - - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed" - fi - fi -} - -src_install() { - if [ -e ${S}/build_gtk ] ; then - cd ${S}/build_gtk - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed" - fi - - if [ -e ${S}/build_unicode ] ; then - cd ${S}/build_unicode - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed" - fi - - if [ -e ${S}/build_gtk2 ] ; then - cd ${S}/build_gtk2 - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed" - fi - - # /usr/bin/wx-config is a symlink to the real wx-config. 2.4 and 2.5 - # don't have compatible versions. (See wxwidgets.eclass) - # Since 2.5.3 is un-tested and breaks most apps, we'll remove wx-config - # and force people to use the wxwidgets eclass and export WX_GTK_VER=2.5 - # to find it: - rm ${D}/usr/bin/wx-config - - dodoc ${S}/*.txt - - # twp 20040830 wxGTK forgets to install htmlproc.h; copy it manually - # Not sure if this will be necessary for 2.5, verify: pythonhead 10 Nov 2004 - # This was for wxRuby - #insinto /usr/include/wx/html - #doins ${S}/include/wx/html/htmlproc.h -} diff --git a/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild deleted file mode 100644 index 904ef9af7c00..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild,v 1.3 2005/06/09 01:12:38 mr_bones_ Exp $ - -inherit wxlib gnuconfig - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and -wxbase non-gui library" - -SLOT="2.6" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64" -IUSE="gnome gtk2 jpeg joystick odbc opengl png sdl tiff wxgtk1" - -RDEPEND="${RDEPEND} - opengl? ( virtual/opengl ) - gtk2? ( >=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 ) - wxgtk1? ( =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* ) - png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) - odbc? ( dev-db/unixODBC ) - !mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )" - -DEPEND="${RDEPEND} - ${DEPEND} - gtk2? ( dev-util/pkgconfig )" -S=${WORKDIR}/wxWidgets-${PV} - -pkg_setup() { - einfo "To install only wxbase (non-gui libs) use -gtk2 -wxgtk1" -} - -src_compile() { - gnuconfig_update - if use wxgtk1 || use gtk2; then - myconf="${myconf} - $(use_enable opengl) - $(use_with png libpng) - $(use_with jpeg libjpeg) - $(use_with tiff libtiff) - $(use_with opengl) - $(use_with gnome gnomeprint) - $(use_with sdl) - $(use_enable joystick)" - fi - - use wxgtk1 && \ - configure_build gtk1 "" "${myconf} --with-gtk=1" - - use gtk2 && \ - configure_build gtk2 unicode "${myconf} --with-gtk=2" - - ! use gtk2 && ! use wxgtk1 && \ - configure_build base unicode "--disable-gui" -} - -src_install() { - use wxgtk1 && install_build gtk1 - use gtk2 && install_build gtk2 - ! use gtk2 && ! use wxgtk1 && install_build base - - wxlib_src_install -} - -pkg_postinst() { - einfo "IMPORTANT: If you are upgrading from wxGTK-2.6.0 to" - einfo "wxGTK-2.6.0-r1 you will need to recomplie applications" - einfo "linked to it. >=dev-db/pgadmin3-1.2.0 is one and any" - einfo "other non-portage wxGTK apps you may have installed also." - einfo "This is necessary due to changing the way wxGTK is built" - einfo "with multilibs instead of a monolithic build." - einfo "Also note dev-libs/wxbase has been removed from portage" - einfo "and can be installed with wxGTK by specifying the USE flags" - einfo "-gtk2 and -wxgtk1" -} |